Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
sorry, my git config forces me to do this 🙃
  • Loading branch information
SuperSandro2000 committed Jul 9, 2024
1 parent 7faf895 commit 06bc4d1
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions ci/Dockerfile.assets.server
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ ARG EXIT_ON_ERROR="true"

# Latest assets server image
# FIRSTRUN!
# NOTE: if this image does not exist
# NOTE: if this image does not exist
# this is the case if the image was not build before
# comment out this line for the first run
# TODO: change to v3 when switching to this version
FROM keppel.eu-de-1.cloud.sap/ccloud/juno-v3-assets-server:latest AS lastbuild

# Base image
FROM keppel.eu-de-1.cloud.sap/ccloud/juno-v3-base:latest AS base
FROM keppel.eu-de-1.cloud.sap/ccloud/juno-v3-base:latest AS base
ARG BASE_URL_PLACEHOLDER

RUN mkdir -p /tmp/latest

# copy all app and lib builds (from dist) to tmp/latest
# copy all app and lib builds (from dist) to tmp/latest
# input is comming from the pipeline

# -> /apps/whois/build, package.json
Expand All @@ -28,19 +28,19 @@ ARG NPM_PROVIDER="jspm"
ARG VERBOSE="false"

# create folder in tmp for merged assets
RUN mkdir -p /tmp/final
RUN mkdir -p /tmp/final

# copy old versions of assets to current layer
# FIRSTRUN!
# NOTE: if this image does not exist
# NOTE: if this image does not exist
# this is the case if the image was not build before
# comment out this line for the first run
COPY --from=lastbuild /usr/share/nginx/html /tmp/final

# delete old assets. Use it once to clean up the old assets.
# RUN rm -rf /tmp/final/externals/*

# merge latest assets over the old assets
# merge latest assets over the old assets
RUN \
# Set the base directory
base_dir=$(pwd); \
Expand Down Expand Up @@ -78,15 +78,15 @@ RUN \
rm -rf /tmp/final/$DIR; \
rm -rf /tmp/final/$ASSET_PATH/$NAME@$VERSION; \
rm -rf /tmp/final/$ASSET_PATH/$NAME@latest; \
mkdir -p /tmp/final/$ASSET_PATH/$NAME@$VERSION; \
mkdir -p /tmp/final/$ASSET_PATH/$NAME@$VERSION; \
cp -r $DIR/* /tmp/final/$ASSET_PATH/$NAME@$VERSION/; \
mkdir -p /tmp/final/$ASSET_PATH/$NAME@latest; \
cp -r $DIR/* /tmp/final/$ASSET_PATH/$NAME@latest/; \
done ;

RUN mkdir -p /tmp/final/global && cp /juno/README.md /tmp/final/global/

WORKDIR /tmp/final
WORKDIR /tmp/final

# ADD generate_importmap.mjs /juno/ci/scripts/generate_importmap.mjs
# delete old importmaps and manifests and obsolete assets (see: ci/obsolete_assets.json
Expand Down Expand Up @@ -148,10 +148,10 @@ LABEL source_repository="https://github.com/sapcc/juno"
# delete default html files of nginx
RUN rm -rf /usr/share/nginx/html
# copy tls certificate and key
COPY --from=base /tmp/tls.crt /tmp/tls.key /etc/ssl/juno/
COPY --from=base /tmp/tls.crt /tmp/tls.key /etc/ssl/juno/
# COPY --from=base /tmp/tls.key /etc/ssl/sap/tls.key

# copy new version
# copy new version
COPY --from=base /tmp/final "/usr/share/nginx/html"

# Replace default nginx config
Expand Down Expand Up @@ -255,4 +255,4 @@ RUN echo -e $'\
</html>' > /usr/share/nginx/html/mount-test.html

# default command is nginx
# CMD nginx -g "daemon off;"
# CMD nginx -g "daemon off;"

0 comments on commit 06bc4d1

Please sign in to comment.