opendev/system-config
Code Issues Proposed changes

Base gitea-init on opendevorg/python-base

Browse Source 
So that we can keep one python base image for our python things,
base jinja-init and gitea-init on python-base. Also, tie jinja-init
to python-base in the dependency graph and gitea-init to jinja-init.
This way if python-base updates, we'll rebuild our python images.

Update FROM lines to use full paths to images.

Change-Id: I554bf07fa8e458e443729cf4b8f40d7ceeaafa04
This commit is contained in:
Monty Taylor 2019-10-23 17:03:58 +09:00
parent 1993d985d0
commit ccaf54c866
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.zuul.yaml
View File

@ -60,6 +60,7 @@
repository: opendevorg/jinja-init repository: opendevorg/jinja-init
files: &jinja-init_files files: &jinja-init_files
- docker/jinja-init/.* - docker/jinja-init/.*
- docker/python-base/.*
- job: - job:
name: system-config-upload-image-jinja-init name: system-config-upload-image-jinja-init
@ -87,6 +88,8 @@
repository: opendevorg/gitea-init repository: opendevorg/gitea-init
files: &gitea-init_files files: &gitea-init_files
- docker/gitea-init/.* - docker/gitea-init/.*
- docker/jinja-init/.*
- docker/python-base/.*
- job: - job:
name: system-config-upload-image-gitea-init name: system-config-upload-image-gitea-init
@ -1067,8 +1070,14 @@
- system-config-run-zuul-preview - system-config-run-zuul-preview
- system-config-run-letsencrypt - system-config-run-letsencrypt
- system-config-build-image-bazel - system-config-build-image-bazel
- system-config-build-image-jinja-init - system-config-build-image-jinja-init:
- system-config-build-image-gitea-init dependencies:
- name: system-config-build-image-python-base
soft: true
- system-config-build-image-gitea-init:
dependencies:
- name: system-config-build-image-jinja-init
soft: true
- system-config-build-image-gitea - system-config-build-image-gitea
- system-config-build-image-gerrit-base: - system-config-build-image-gerrit-base:
dependencies: dependencies:
@ -1126,8 +1135,14 @@
- system-config-run-zuul-preview - system-config-run-zuul-preview
- system-config-run-letsencrypt - system-config-run-letsencrypt
- system-config-upload-image-bazel - system-config-upload-image-bazel
- system-config-upload-image-jinja-init - system-config-upload-image-jinja-init:
- system-config-upload-image-gitea-init dependencies:
- name: system-config-build-image-python-base
soft: true
- system-config-upload-image-gitea-init:
dependencies:
- name: system-config-build-image-jinja-init
soft: true
- system-config-upload-image-gitea - system-config-upload-image-gitea
- system-config-upload-image-gerrit-base: - system-config-upload-image-gerrit-base:
dependencies: dependencies:

2
docker/gitea-init/Dockerfile
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
FROM opendevorg/jinja-init as gitea-init FROM docker.io/opendevorg/jinja-init as gitea-init
COPY entrypoint.sh / COPY entrypoint.sh /

4
docker/jinja-init/Dockerfile
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
FROM python:slim as build FROM docker.io/opendevorg/python-base as build
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git \ git \
@ -25,7 +25,7 @@ WORKDIR /src/jinja-init
RUN git checkout 8c13a44124a5a363519df787b1cd0abd1198b8df RUN git checkout 8c13a44124a5a363519df787b1cd0abd1198b8df
FROM python:slim as jinja-init FROM docker.io/opendevorg/python-base as jinja-init
RUN pip install jinja2 RUN pip install jinja2