Skip to content
Snippets Groups Projects
Commit 1710b6ce authored by Georgi N. Georgiev's avatar Georgi N. Georgiev
Browse files

Revert "Merge branch 'alpine-3-13' into 'main'"

This reverts merge request !3057
parent ff62fd75
No related branches found
No related tags found
Loading
......@@ -15,7 +15,7 @@ variables:
PWSH_VERSION: "7.1.1"
PWSH_IMAGE_DATE: "20210114"
PWSH_ALPINE_IMAGE_VERSION: "3.12"
ALPINE_IMAGE_VERSION: "3.13.6"
ALPINE_IMAGE_VERSION: "3.12.0"
UBUNTU_IMAGE_VERSION: "20.04"
DUMB_INIT_VERSION: "1.2.2"
GIT_VERSION: "2.30.2"
......
......@@ -303,7 +303,7 @@ static QA:
- .rules:merge_request_pipelines:no_docs
- .no_cache
stage: release
image: alpine:3.13.6
image: alpine:3.12.0
needs:
- code_quality
script: |
......
......@@ -111,7 +111,7 @@ ${BASE_TAR_PATH}-ubuntu-%-pwsh.tar: ${BASE_BINARY_PATH}.%
@mkdir -p $$(dirname $@_)
@./ci/build_helper_docker ubuntu $* $@
${BASE_TAR_PATH}-alpine-%.tar: export ALPINE_IMAGE_VERSION ?= 3.13.6
${BASE_TAR_PATH}-alpine-%.tar: export ALPINE_IMAGE_VERSION ?= 3.12.0
${BASE_TAR_PATH}-alpine-%.tar: export TARGET_FLAVOR_IMAGE_VERSION ?= ${ALPINE_IMAGE_VERSION}
${BASE_TAR_PATH}-alpine-%.tar: ${BASE_BINARY_PATH}.%
@mkdir -p $$(dirname $@_)
......
......@@ -175,15 +175,15 @@ func TestJobImageExposed(t *testing.T) {
expectImageName string
}{
"normal image exposed": {
image: "alpine:3.13",
image: "alpine:3.11",
expectVarExists: true,
expectImageName: "alpine:3.13",
expectImageName: "alpine:3.11",
},
"image with variable expansion": {
image: "${IMAGE}:3.13",
image: "${IMAGE}:3.11",
vars: []JobVariable{{Key: "IMAGE", Value: "alpine", Public: true}},
expectVarExists: true,
expectImageName: "alpine:3.13",
expectImageName: "alpine:3.11",
},
"no image specified": {
image: "",
......
......@@ -41,7 +41,7 @@ const (
var PreparationRetryInterval = 3 * time.Second
const (
TestAlpineImage = "alpine:3.13.6"
TestAlpineImage = "alpine:3.12.0"
TestWindowsImage = "mcr.microsoft.com/windows/servercore:%s"
TestPwshImage = "mcr.microsoft.com/powershell:7.1.1-alpine-3.12-20210125"
TestAlpineNoRootImage = "registry.gitlab.com/gitlab-org/gitlab-runner/alpine-no-root:latest"
......
FROM alpine:3.13.6
FROM alpine:3.12.0
ARG TARGETPLATFORM
......
......@@ -4164,7 +4164,7 @@ func TestExecutor_buildPermissionsInitContainer(t *testing.T) {
config: common.RunnerConfig{
RunnerSettings: common.RunnerSettings{
Kubernetes: &common.KubernetesConfig{
Image: "alpine:3.13",
Image: "alpine:3.12",
PullPolicy: common.StringOrArray{common.PullPolicyIfNotPresent},
Host: "127.0.0.1",
},
......@@ -4183,7 +4183,7 @@ func TestExecutor_buildPermissionsInitContainer(t *testing.T) {
config: common.RunnerConfig{
RunnerSettings: common.RunnerSettings{
Kubernetes: &common.KubernetesConfig{
Image: "alpine:3.13",
Image: "alpine:3.12",
PullPolicy: common.StringOrArray{common.PullPolicyIfNotPresent},
Host: "127.0.0.1",
},
......@@ -4196,7 +4196,7 @@ func TestExecutor_buildPermissionsInitContainer(t *testing.T) {
RunnerSettings: common.RunnerSettings{
Kubernetes: &common.KubernetesConfig{
HelperImage: "config-image",
Image: "alpine:3.13",
Image: "alpine:3.12",
PullPolicy: common.StringOrArray{common.PullPolicyIfNotPresent},
Host: "127.0.0.1",
},
......
FROM alpine:3.13.6
FROM alpine:3.12.0
RUN adduser alpine -D
USER alpine
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment