Skip to content

Commit

Permalink
chore: update indenting in dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Zaperex committed Nov 2, 2023
1 parent a37c375 commit b57cfe2
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ FROM skeleton AS cleanup

# Upstream only - copy the install dependencies from the build stage and context
COPY --from=build $CONTAINER_SOURCE/yarn.lock \
$CONTAINER_SOURCE/package.json \
$CONTAINER_SOURCE/packages/backend/dist/skeleton.tar.gz \
$CONTAINER_SOURCE/packages/backend/dist/bundle.tar.gz \
./
$CONTAINER_SOURCE/package.json \
$CONTAINER_SOURCE/packages/backend/dist/skeleton.tar.gz \
$CONTAINER_SOURCE/packages/backend/dist/bundle.tar.gz \
./
ENV TARBALL_PATH=.
RUN tar xzf $TARBALL_PATH/skeleton.tar.gz; tar xzf $TARBALL_PATH/bundle.tar.gz; \
rm -f $TARBALL_PATH/skeleton.tar.gz $TARBALL_PATH/bundle.tar.gz
rm -f $TARBALL_PATH/skeleton.tar.gz $TARBALL_PATH/bundle.tar.gz

# Copy app-config files needed in runtime
# Upstream only
Expand Down
50 changes: 25 additions & 25 deletions docker/brew.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ RUN \

# Downstream only - debug
# RUN echo $PATH; ls -la /usr/local/bin/yarn; whereis yarn;which yarn; yarn --version; \
# cat $CONTAINER_SOURCE/.npmrc || true; \
# $YARN config list --verbose; npm config list; npm config list -l
# cat $CONTAINER_SOURCE/.npmrc || true; \
# $YARN config list --verbose; npm config list; npm config list -l

RUN $YARN install --frozen-lockfile --network-timeout 600000

Expand All @@ -125,10 +125,10 @@ RUN $YARN build --filter=backend
# Downstream only - Cachito configuration
# replace external registry refs with cachito ones
RUN cachitoRegistry=$(npm config get registry); echo "cachito registry: $cachitoRegistry"; \
for d in $(find . -name yarn.lock); do echo; echo "===== $d ====="; \
sed -i $d -r -e "s#(https://registry.yarnpkg.com|https://registry.npmjs.org)#${cachitoRegistry}#g"; \
grep resolved $d | head -1; echo "Total $(grep resolved $d | wc -l) resolution lines in $d"; \
done
for d in $(find . -name yarn.lock); do echo; echo "===== $d ====="; \
sed -i $d -r -e "s#(https://registry.yarnpkg.com|https://registry.npmjs.org)#${cachitoRegistry}#g"; \
grep resolved $d | head -1; echo "Total $(grep resolved $d | wc -l) resolution lines in $d"; \
done
# debug - were the above changes successful?
# RUN echo "=== Check for yarn.lock files that don't use cachito registry ===>"; \
# for d in $(find . -name yarn.lock); do \
Expand All @@ -151,7 +151,7 @@ RUN find dynamic-plugins -type f -not -name 'dist' -delete

ENV TARBALL_PATH=./packages/backend/dist
RUN tar xzf $TARBALL_PATH/skeleton.tar.gz; tar xzf $TARBALL_PATH/bundle.tar.gz; \
rm -f $TARBALL_PATH/skeleton.tar.gz $TARBALL_PATH/bundle.tar.gz
rm -f $TARBALL_PATH/skeleton.tar.gz $TARBALL_PATH/bundle.tar.gz

# Copy app-config files needed in runtime
# Upstream only
Expand All @@ -178,24 +178,24 @@ WORKDIR $CONTAINER_SOURCE/
# Downstream only - install techdocs dependencies using cachito sources
COPY $REMOTE_SOURCES/upstream2 ./upstream2/
RUN microdnf update -y && \
microdnf install -y python3.11 python3.11-pip python3.11-devel make cmake cpp gcc gcc-c++; \
ln -s /usr/bin/pip3.11 /usr/bin/pip3; \
ln -s /usr/bin/pip3.11 /usr/bin/pip; \
# ls -la $CONTAINER_SOURCE/ $CONTAINER_SOURCE/upstream2/ $CONTAINER_SOURCE/upstream2/app/distgit/containers/rhdh-hub/docker/ || true; \
cat $CONTAINER_SOURCE/upstream2/cachito.env && \
# cachito.env contains path to cert:
# export PIP_CERT=/remote-source/upstream2/app/package-index-ca.pem
source $CONTAINER_SOURCE/upstream2/cachito.env && \
# fix ownership for pip install folder
mkdir -p /opt/app-root/src/.cache/pip && chown -R root:root /opt/app-root && \
# ls -ld /opt/ /opt/app-root /opt/app-root/src/ /opt/app-root/src/.cache /opt/app-root/src/.cache/pip || true; \
pushd $CONTAINER_SOURCE/upstream2/app/distgit/containers/rhdh-hub/docker/ >/dev/null && \
set -xe; \
python3.11 -V; pip3.11 -V; \
pip3.11 install --user --no-cache-dir --upgrade pip setuptools pyyaml; \
pip3.11 install --user --no-cache-dir -r requirements.txt -r requirements-build.txt; \
popd >/dev/null; \
microdnf clean all; rm -fr $CONTAINER_SOURCE/upstream2
microdnf install -y python3.11 python3.11-pip python3.11-devel make cmake cpp gcc gcc-c++; \
ln -s /usr/bin/pip3.11 /usr/bin/pip3; \
ln -s /usr/bin/pip3.11 /usr/bin/pip; \
# ls -la $CONTAINER_SOURCE/ $CONTAINER_SOURCE/upstream2/ $CONTAINER_SOURCE/upstream2/app/distgit/containers/rhdh-hub/docker/ || true; \
cat $CONTAINER_SOURCE/upstream2/cachito.env && \
# cachito.env contains path to cert:
# export PIP_CERT=/remote-source/upstream2/app/package-index-ca.pem
source $CONTAINER_SOURCE/upstream2/cachito.env && \
# fix ownership for pip install folder
mkdir -p /opt/app-root/src/.cache/pip && chown -R root:root /opt/app-root && \
# ls -ld /opt/ /opt/app-root /opt/app-root/src/ /opt/app-root/src/.cache /opt/app-root/src/.cache/pip || true; \
pushd $CONTAINER_SOURCE/upstream2/app/distgit/containers/rhdh-hub/docker/ >/dev/null && \
set -xe; \
python3.11 -V; pip3.11 -V; \
pip3.11 install --user --no-cache-dir --upgrade pip setuptools pyyaml; \
pip3.11 install --user --no-cache-dir -r requirements.txt -r requirements-build.txt; \
popd >/dev/null; \
microdnf clean all; rm -fr $CONTAINER_SOURCE/upstream2

# Downstream only - copy from build, not cleanup stage
COPY --from=build --chown=1001:1001 $CONTAINER_SOURCE/ ./
Expand Down

0 comments on commit b57cfe2

Please sign in to comment.