airship/armada-go
Code Issues Proposed changes

Updated base image docker repo url

Browse Source 
Change-Id: If70ca802002f6b6e747641d1ebfab29793109b6e
This commit is contained in:
Sergiy Markin 2024-12-21 05:23:31 +00:00
parent b01dbef358
commit caebcbfe80
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/armada-go/Dockerfile.ubuntu_focal
View File

@ -1,5 +1,5 @@
ARG FROM=public.ecr.aws/ubuntu/ubuntu:focal
ARG GO_IMAGE=public.ecr.aws/docker/library/golang:1.21.1-bullseye
ARG FROM=quay.io/airshipit/ubuntu:focal
ARG GO_IMAGE=quay.io/airshipit/golang:1.21.1-bullseye
FROM ${GO_IMAGE} as builder
ENV PATH "/usr/local/go/bin:$PATH"

4
images/armada-go/Dockerfile.ubuntu_jammy
View File

@ -1,5 +1,5 @@
ARG FROM=public.ecr.aws/ubuntu/ubuntu:jammy
ARG GO_IMAGE=public.ecr.aws/docker/library/golang:1.23.1-bullseye
ARG FROM=quay.io/airshipit/ubuntu:jammy
ARG GO_IMAGE=quay.io/airshipit/golang:1.23.1-bullseye
FROM ${GO_IMAGE} as builder
ENV PATH "/usr/local/go/bin:$PATH"

2
tools/gate/roles/airship-run-script-set/defaults/main.yaml
View File

@ -24,7 +24,7 @@ HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
COREDNS_VERSION: v1.11.1
DISTRO: ubuntu_focal
DISTRO: ubuntu_jammy
DOCKER_REGISTRY: quay.io
CLONE_ARMADA: true
CLONE_ARMADA_GO: true

2
tools/gate/roles/airship-run-script-set/tasks/main.yaml
View File

@ -40,7 +40,7 @@
OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}"
COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}"
DISTRO: "{{ DISTRO | default('ubuntu_focal') }}"
DISTRO: "{{ DISTRO | default('ubuntu_jammy') }}"
DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}"
CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}"
CLONE_ARMADA_GO: "{{ CLONE_ARMADA_GO | default('true') }}"

2
tools/gate/roles/airship-run-script/defaults/main.yaml
View File

@ -24,7 +24,7 @@ HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
COREDNS_VERSION: v1.11.1
DISTRO: ubuntu_focal
DISTRO: ubuntu_jammy
DOCKER_REGISTRY: quay.io
CLONE_ARMADA: true

2
tools/gate/roles/airship-run-script/tasks/main.yaml
View File

@ -37,7 +37,7 @@
OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}"
COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}"
DISTRO: "{{ DISTRO | default('ubuntu_focal') }}"
DISTRO: "{{ DISTRO | default('ubuntu_jammy') }}"
DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}"
CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}"
CLONE_ARMADA_GO: "{{ CLONE_ARMADA_GO | default('true') }}"