Skip to content

Commit

Permalink
fix(Dockerfile): use [email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
shahabganji authored and 3cp committed Oct 1, 2019
1 parent b329a85 commit ec9234b
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions skeleton/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM node:12 as build
FROM node:lts as build-stage

// @if feat.cypress || feat.protractor || feat.karma
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -32,12 +32,12 @@ RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/google-
&& ( dpkg -i /tmp/google-chrome-stable_current_amd64.deb || apt-get -fy install) \
&& rm -rf /tmp/google-chrome-stable_current_amd64.deb \
&& sed -i 's|HERE/chrome"|HERE/chrome" --disable-setuid-sandbox --no-sandbox|g' \
"/opt/google/chrome/google-chrome" \
"/opt/google/chrome/google-chrome" \
&& google-chrome --version

// @endif

RUN npm install -g aurelia-cli@1.1.0
RUN npm install -g aurelia-cli@1.2.0


WORKDIR /app
Expand Down Expand Up @@ -84,32 +84,32 @@ RUN npm run e2e:headless
// @endif

# build
FROM build as publish
FROM build-stage as publish-stage
RUN au build --env prod

# run-time stage
FROM nginx:alpine as run-time
# production stage
FROM nginx:alpine as production-stage
COPY nginx.conf /etc/nginx/nginx.conf
WORKDIR /usr/share/nginx/html

// @if feat.webpack && !feat["dotnet-core"]
COPY --from=publish /app/dist/ .
COPY --from=publish-stage /app/dist/ .
// @endif

// @if feat.webpack && feat["dotnet-core"]
COPY --from=publish /app/wwwroot/dist/ .
COPY --from=publish-stage /app/wwwroot/dist/ .
// @endif

// @if feat["cli-bundler"] && feat["dotnet-core"]
COPY --from=publish /app/wwwroot/ .
COPY --from=publish-stage /app/wwwroot/ .
// @endif

// @if feat["cli-bundler"] && !feat["dotnet-core"]
// @if feat["scaffold-navigation"]
COPY --from=publish /app/bootstrap/dist/ ./bootstrap/dist/
COPY --from=publish-stage /app/bootstrap/dist/ ./bootstrap/dist/
// @endif
COPY --from=publish /app/scripts/ ./scripts/
COPY --from=publish /app/index.html/ .
COPY --from=publish-stage /app/scripts/ ./scripts/
COPY --from=publish-stage /app/index.html/ .
// @endif

EXPOSE 80
Expand Down

0 comments on commit ec9234b

Please sign in to comment.