mirror of
https://github.com/bitwarden/server.git
synced 2025-06-18 10:03:50 -05:00
update dockerfiles
This commit is contained in:
parent
71fed60689
commit
eeddc1f620
@ -1,3 +1,14 @@
|
|||||||
|
###############################################
|
||||||
|
# Node.js build stage #
|
||||||
|
###############################################
|
||||||
|
FROM node:20-alpine AS node-build
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY src/Admin/package*.json ./
|
||||||
|
COPY /src/Admin/ .
|
||||||
|
RUN npm ci
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
###############################################
|
###############################################
|
||||||
# Build stage #
|
# Build stage #
|
||||||
###############################################
|
###############################################
|
||||||
@ -20,12 +31,13 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
|
|||||||
&& echo "RID=$RID" > /tmp/rid.txt
|
&& echo "RID=$RID" > /tmp/rid.txt
|
||||||
|
|
||||||
# Set up Node
|
# Set up Node
|
||||||
ARG NODE_VERSION=20
|
# ARG NODE_VERSION=20
|
||||||
RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - \
|
# RUN apk add --no-cache "nodejs~${NODE_VERSION}" "npm"
|
||||||
&& apt-get update \
|
# RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - \
|
||||||
&& apt-get install -y nodejs \
|
# && apt-get update \
|
||||||
&& npm install -g npm@latest && \
|
# && apt-get install -y nodejs \
|
||||||
rm -rf /var/lib/apt/lists/*
|
# && npm install -g npm@latest && \
|
||||||
|
# rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Copy required project files
|
# Copy required project files
|
||||||
WORKDIR /source
|
WORKDIR /source
|
||||||
@ -33,11 +45,11 @@ COPY . ./
|
|||||||
|
|
||||||
# Restore project dependencies and tools
|
# Restore project dependencies and tools
|
||||||
WORKDIR /source/src/Admin
|
WORKDIR /source/src/Admin
|
||||||
RUN npm ci
|
#RUN npm ci
|
||||||
RUN . /tmp/rid.txt && dotnet restore -r $RID
|
RUN . /tmp/rid.txt && dotnet restore -r $RID
|
||||||
|
|
||||||
# Build project
|
# Build project
|
||||||
RUN npm run build
|
#RUN npm run build
|
||||||
RUN . /tmp/rid.txt && dotnet publish \
|
RUN . /tmp/rid.txt && dotnet publish \
|
||||||
-c release \
|
-c release \
|
||||||
--no-restore \
|
--no-restore \
|
||||||
@ -60,12 +72,15 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
|
tzdata \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
# Copy app from the build stage
|
# Copy app from the build stage
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=build /source/src/Admin/out /app
|
COPY --from=build /source/src/Admin/out /app
|
||||||
|
COPY --from=node-build /app/wwwroot /app/wwwroot
|
||||||
COPY ./src/Admin/entrypoint.sh /entrypoint.sh
|
COPY ./src/Admin/entrypoint.sh /entrypoint.sh
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint.sh
|
||||||
HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1
|
HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 34 KiB |
@ -51,6 +51,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
@ -50,6 +50,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
|||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
RUN apk add curl \
|
RUN apk add curl \
|
||||||
|
icu-libs \
|
||||||
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
&& apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
|
||||||
&& rm -rf /var/cache/apk/*
|
&& rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user