Skip to content
Snippets Groups Projects
Commit 8b007c37 authored by Miguel Santos's avatar Miguel Santos
Browse files

Merge branch 'st-1229-update-alpine-images' into 'master'

Update alpine images to 3.15

See merge request ska-telescope/ska-tango-images!147
parents 54944399 fd3811bd
Branches
Tags
No related merge requests found
......@@ -699,7 +699,7 @@ k8s-test-alpine:
- make k8s-install-chart IS_ALPINE="-alpine" CAR_OCI_REGISTRY_HOST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}
- make k8s-wait
script:
- make k8s-test K8S_TEST_IMAGE_TO_TEST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-tango-itango-alpine:9.3.7
- make k8s-test K8S_TEST_IMAGE_TO_TEST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-tango-itango-alpine:9.3.9
after_script:
- echo $CI_JOB_NAME - $CI_JOB_STAGE
- make k8s-uninstall-chart
......
......@@ -9,7 +9,7 @@ KUBE_NAMESPACE ?= ska-tango-images#namespace to be used
RELEASE_NAME ?= test## release name of the chart
K8S_CHART = ska-tango-umbrella
MINIKUBE ?= true ## Minikube or not
K8S_TEST_IMAGE_TO_TEST ?= artefact.skao.int/ska-tango-images-tango-itango:9.3.7 ## TODO: UGUR docker image that will be run for testing purpose
K8S_TEST_IMAGE_TO_TEST ?= artefact.skao.int/ska-tango-images-tango-itango:9.3.9 ## TODO: UGUR docker image that will be run for testing purpose
CI_JOB_ID ?= local##pipeline job id
TEST_RUNNER ?= test-mk-runner-$(CI_JOB_ID)##name of the pod running the k8s_tests
TANGO_HOST ?= makefile-databaseds-also-node-port:10000## TANGO_HOST connection to the Tango DS
......
ARG CAR_OCI_REGISTRY_HOST
ARG BASE_IMAGE="alpine:3.14"
ARG BASE_IMAGE="alpine:3.15"
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies-alpine:0.0.0"
FROM $BUILD_IMAGE AS buildenv
......
ARG CAR_OCI_REGISTRY_HOST
ARG BASE_IMAGE="alpine:3.14"
ARG BASE_IMAGE="alpine:3.15"
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp-alpine:0.0.0"
FROM $BUILD_IMAGE AS buildenv
......
......@@ -3,7 +3,7 @@
# intermediate image, then creates a release image containing the compiled
# binaries.
#
ARG BASE_IMAGE="alpine:3.14"
ARG BASE_IMAGE="alpine:3.15"
FROM $BASE_IMAGE as buildenv
# Install build time dependencies
......
ARG CAR_OCI_REGISTRY_HOST
ARG BUILD_IMAGE=alpine:3.14
ARG BUILD_IMAGE=alpine:3.15
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java-alpine:0.0.0"
FROM $BUILD_IMAGE AS buildenv
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment