diff options
| author | Rob Mohr <mohrr@google.com> | 2020-07-30 08:50:49 -0700 |
|---|---|---|
| committer | CQ Bot Account <commit-bot@chromium.org> | 2020-07-31 13:59:31 +0000 |
| commit | e5f50fa94b2bbc1154c16db3cd81d9875e2f26eb (patch) | |
| tree | 13de3b8f2a44d2c7b03ce843064c9439d0ecd3c3 /docker | |
| parent | 70b9264a187a6a640221d552b8dae64faa1ee68c (diff) | |
| download | pigweed-e5f50fa94b2bbc1154c16db3cd81d9875e2f26eb.tar.gz | |
docker: Create second file for running tests
Dockerfile is now Dockerfile.cache which will be run approximately
weekly and will contain the cache of the current tools. New file
Dockerfile.run will start from that image and copy in the current
workspace.
Change-Id: If9c0311f7122fbed1f5e86e4d6391c0a1382765f
Bug: 216
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/15040
Reviewed-by: Johan Euphrosine <proppy@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.cache (renamed from docker/Dockerfile) | 5 | ||||
| -rw-r--r-- | docker/Dockerfile.run | 21 |
2 files changed, 23 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile.cache index c96858230..28deb30be 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile.cache @@ -22,8 +22,8 @@ ENV CIPD_CACHE_DIR /pigweed-cache/cipd-cache-dir # This is only for seeding the environment, not meant to be used. Running # bootstrap inside another checkout will reset PW_ROOT but leave # PW_ENVIRONMENT_ROOT alone. -ENV PW_ROOT /pigweed-cache/pigweed -ENV PW_ENVIRONMENT_ROOT /pigweed-cache/environment +ENV PW_ROOT /cache/pigweed +ENV PW_ENVIRONMENT_ROOT /cache/environment ENV PW_CIPD_PACKAGE_FILES "$PW_ROOT/pw_env_setup/py/pw_env_setup/cipd_setup/*.json" WORKDIR $PW_ROOT @@ -37,6 +37,5 @@ RUN $PW_ROOT/pw_env_setup/py/pw_env_setup/env_setup.py \ --shell-file $PW_ROOT/init.sh \ --pw-root $PW_ROOT \ --install-dir $PW_ENVIRONMENT_ROOT -COPY . $PW_ROOT CMD /bin/bash diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run new file mode 100644 index 000000000..3cd21b35e --- /dev/null +++ b/docker/Dockerfile.run @@ -0,0 +1,21 @@ +# Copyright 2020 The Pigweed Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. + +ARG from +FROM ${from} + +WORKDIR /workspace +COPY . /workspace + +CMD /bin/bash |