ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

split vendor overrides into own file 

refs DE-1465

[build-registry-path=jenkins/canvas-lms/de-1465]
[change-merged]

Change-Id: I12e7883091614883b724e4a50164aa5abf4f5cca
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/306294
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Bobby Buten <bobby.buten@instructure.com>
Build-Review: Bobby Buten <bobby.buten@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
This commit is contained in:
Aaron Ogata 2022-11-30 05:12:43 -08:00
parent 227e5ac3d2
commit a5d18d91db
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile.jenkins-cache
View File

@ -8,7 +8,6 @@ RUN --mount=target=/tmp/src \
set -o errexit -o errtrace -o nounset -o pipefail && \
shopt -s globstar && \
tar --sort=name --mtime='1970-01-01' --owner=0 --group=0 --numeric-owner --mode='a+rwX' -cf - \
--exclude='vendor/qti_migration_tool' \
config/canvas_rails_switcher.rb \
Gemfile \
Gemfile.d \
@ -20,7 +19,6 @@ RUN --mount=target=/tmp/src \
engines/**/Gemfile \
engines/**/*.gemspec \
engines/**/version.rb \
vendor \
\
| tee /tmp/dst/ruby-runner.tar | md5sum > /tmp/dst/ruby-runner.tar.md5 && \
\
@ -92,6 +90,12 @@ RUN --mount=target=/tmp/src \
\
| tee /tmp/dst/webpack-runner.tar | md5sum > /tmp/dst/webpack-runner.tar.md5 && \
\
tar --sort=name --mtime='1970-01-01' --owner=0 --group=0 --numeric-owner --mode='a+rwX' -cf - \
--exclude='vendor/qti_migration_tool' \
vendor \
\
| tee /tmp/dst/webpack-runner-vendor.tar | md5sum > /tmp/dst/webpack-runner-vendor.tar.md5 && \
\
tar --sort=name --mtime='1970-01-01' --owner=0 --group=0 --numeric-owner --mode='a+rwX' -cf - \
app/stylesheets \
config/brandable_css.yml \
@ -122,4 +126,5 @@ RUN --mount=target=/tmp/src \
echo "YARN_RUNNER_MD5=$(cat /tmp/dst/yarn-runner.tar.md5 | cut -d' ' -f1)" >> /tmp/dst/environment.sh && \
echo "WEBPACK_BUILDER_MD5=$(cat /tmp/dst/webpack-builder.tar.md5 | cut -d' ' -f1)" >> /tmp/dst/environment.sh && \
echo "WEBPACK_RUNNER_MD5=$(cat /tmp/dst/webpack-runner.tar.md5 | cut -d' ' -f1)" >> /tmp/dst/environment.sh && \
echo "WEBPACK_RUNNER_DEPENDENCIES_MD5=$(cat /tmp/dst/webpack-runner-dependencies.tar.md5 | cut -d' ' -f1)" >> /tmp/dst/environment.sh
echo "WEBPACK_RUNNER_DEPENDENCIES_MD5=$(cat /tmp/dst/webpack-runner-dependencies.tar.md5 | cut -d' ' -f1)" >> /tmp/dst/environment.sh && \
echo "WEBPACK_RUNNER_VENDOR_MD5=$(cat /tmp/dst/webpack-runner-vendor.tar.md5 | cut -d' ' -f1)" >> /tmp/dst/environment.sh

5
Dockerfile.jenkins.final
View File

@ -4,7 +4,10 @@ ARG COMPILE_ADDITIONAL_ASSETS=0
COPY --chown=docker:docker . ${APP_HOME}
RUN cp -v docker-compose/config/redis.yml config && \
RUN \
--mount=type=bind,from=local/cache-helper,source=/tmp/dst,target=/cache-helper \
tar --no-same-owner -xf /cache-helper/webpack-runner-vendor.tar -C ${APP_HOME} && \
cp -v docker-compose/config/redis.yml config && \
cp -v docker-compose/config/selenium.yml config/ && \
cp -vR docker-compose/config/new-jenkins/* config/ && \
cp -v config/delayed_jobs.yml.example config/delayed_jobs.yml && \

1
Dockerfile.jenkins.webpack-runner
View File

@ -5,6 +5,7 @@ RUN \
--mount=type=bind,from=local/webpack-assets-previous,target=/mount/webpack-assets-previous \
--mount=type=bind,from=local/webpack-cache-previous,target=/mount/webpack-cache-previous \
tar --no-same-owner -xf /cache-helper/webpack-runner-dependencies.tar -C ${APP_HOME} && \
tar --no-same-owner -xf /cache-helper/webpack-runner-vendor.tar -C ${APP_HOME} && \
tar --no-same-owner -xf /cache-helper/webpack-runner.tar -C ${APP_HOME} && \
{ { cd /mount/webpack-assets-previous/usr/src/app && cp --parents -rf public/dist/brandable_css ${APP_HOME}; } || true; } && \
{ { cd /mount/webpack-cache-previous && cp --parents -rf node_modules/.cache ${APP_HOME}; } || true; }

3
build/new-jenkins/docker-build.sh
View File

@ -36,7 +36,7 @@ WORKSPACE=${WORKSPACE:-$(pwd)}
# $WEBPACK_BUILDER_TAG: additional tag for the webpack-builder image
# - set to patchset unique ID for builds to reference without knowing about the hash ID
export CACHE_VERSION="2022-10-31.1"
export CACHE_VERSION="2022-11-30.1"
export DOCKER_BUILDKIT=1
if [[ "$WRITE_BUILD_CACHE" == "1" ]]; then
@ -100,6 +100,7 @@ WEBPACK_RUNNER_PARTS=(
$WEBPACK_RUNNER_DOCKERFILE_MD5
$WEBPACK_RUNNER_MD5
$WEBPACK_RUNNER_DEPENDENCIES_MD5
$WEBPACK_RUNNER_VENDOR_MD5
)
WEBPACK_ASSETS_PARTS=(
"${WEBPACK_RUNNER_PARTS[@]}"