Skip to content

Commit 554f569

Browse files
committed
Revert TMP action
1 parent 41117ed commit 554f569

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

images/baked/application/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ USER spryker
1111
COPY --chown=spryker:spryker composer.json composer.lock ${srcRoot}/
1212
ARG SPRYKER_COMPOSER_MODE
1313
ARG SPRYKER_COMPOSER_VERBOSE
14-
# RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer/cache,uid=1000 \
15-
# --mount=type=bind,from=composer-cache,source=/,target=/tmp/composer-cache \
16-
# --mount=type=ssh,uid=1000 \
17-
# --mount=type=secret,id=secrets-env,uid=1000 \
18-
# cp -a /tmp/composer-cache/cache/. /home/spryker/.composer/cache/ 2>/dev/null || true \
19-
# && set -o allexport && . /run/secrets/secrets-env && set +o allexport \
20-
# && composer install --no-scripts --no-interaction ${SPRYKER_COMPOSER_MODE} ${SPRYKER_COMPOSER_VERBOSE}
14+
RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer/cache,uid=1000 \
15+
--mount=type=bind,from=composer-cache,source=/,target=/tmp/composer-cache \
16+
--mount=type=ssh,uid=1000 \
17+
--mount=type=secret,id=secrets-env,uid=1000 \
18+
cp -a /tmp/composer-cache/cache/. /home/spryker/.composer/cache/ 2>/dev/null || true \
19+
&& set -o allexport && . /run/secrets/secrets-env && set +o allexport \
20+
&& composer install --no-scripts --no-interaction ${SPRYKER_COMPOSER_MODE} ${SPRYKER_COMPOSER_VERBOSE}
2121

2222
FROM application-production-dependencies AS application-production-codebase
2323

@@ -39,7 +39,7 @@ ENV APPLICATION_ENV=${APPLICATION_ENV}
3939
ENV SPRYKER_DB_ENGINE=${SPRYKER_DB_ENGINE}
4040

4141
COPY --chown=spryker:spryker data ${srcRoot}/data
42-
# RUN vendor/bin/install -r ${SPRYKER_PIPELINE} -s build -s build-production -vvv
42+
RUN vendor/bin/install -r ${SPRYKER_PIPELINE} -s build -s build-production -vvv
4343

4444
ARG SPRYKER_COMPOSER_AUTOLOAD
4545
RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer/cache,uid=1000 \

images/baked/assets/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ENV SPRYKER_ASSETS_MODE=${SPRYKER_ASSETS_MODE}
2323
ARG SPRYKER_PIPELINE
2424
ENV SPRYKER_PIPELINE=${SPRYKER_PIPELINE}
2525

26-
# RUN --mount=type=cache,id=npm,sharing=locked,target=/root/.npm \
27-
# echo "BUILD HASH: ${SPRYKER_BUILD_HASH}" \
28-
# && echo "MODE: ${SPRYKER_ASSETS_MODE}" \
29-
# && vendor/bin/install -r ${SPRYKER_PIPELINE} -s build-static -s build-static-${SPRYKER_ASSETS_MODE} -vvv
26+
RUN --mount=type=cache,id=npm,sharing=locked,target=/root/.npm \
27+
echo "BUILD HASH: ${SPRYKER_BUILD_HASH}" \
28+
&& echo "MODE: ${SPRYKER_ASSETS_MODE}" \
29+
&& vendor/bin/install -r ${SPRYKER_PIPELINE} -s build-static -s build-static-${SPRYKER_ASSETS_MODE} -vvv

images/baked/cli/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ USER spryker
88
# Install composer modules for Spryker
99
COPY --chown=spryker:spryker composer.json composer.lock ${srcRoot}/
1010
ARG SPRYKER_COMPOSER_MODE
11-
# RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer/cache,uid=1000 \
12-
# --mount=type=ssh,uid=1000 --mount=type=secret,id=secrets-env,uid=1000 \
13-
# set -o allexport && . /run/secrets/secrets-env && set +o allexport \
14-
# && composer install --no-interaction ${SPRYKER_COMPOSER_MODE}
11+
RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer/cache,uid=1000 \
12+
--mount=type=ssh,uid=1000 --mount=type=secret,id=secrets-env,uid=1000 \
13+
set -o allexport && . /run/secrets/secrets-env && set +o allexport \
14+
&& composer install --no-interaction ${SPRYKER_COMPOSER_MODE}
1515

1616
ARG SPRYKER_COMPOSER_AUTOLOAD
1717
RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer/cache,uid=1000 \
@@ -21,4 +21,4 @@ RUN --mount=type=cache,id=composer,sharing=locked,target=/home/spryker/.composer
2121
COPY --chown=spryker:spryker tests ${srcRoot}/tests
2222

2323
ENV DEVELOPMENT_CONSOLE_COMMANDS=1
24-
# RUN vendor/bin/install -r ${SPRYKER_PIPELINE} -s build-development
24+
RUN vendor/bin/install -r ${SPRYKER_PIPELINE} -s build-development

0 commit comments

Comments
 (0)