From dd60546fba07eea41cddb91f346cd4bdcca14618 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Thu, 20 Jan 2022 04:16:21 +0300 Subject: [PATCH] Reverting alpine image version. Trying to fix invalid bug with Docker In Docker and MUSL. --- .gitlab-ci.yml | 13 +++++++------ Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10d7600..50d0241 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,10 @@ variables: DOCKER_HUB_TOKEN: "xxx" build: - image: docker:19.03.12 + # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 + image: docker:20.10.12 services: - - docker:19.03.12-dind + - docker:20.10.12-dind stage: build script: - docker build -t $BUILT_IMAGE_TAG --no-cache . @@ -22,9 +23,9 @@ build: - images.tar push-gitlab-registry: - image: docker:19.03.12 + image: docker:20.10.12 services: - - docker:19.03.12-dind + - docker:20.10.12-dind stage: push script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY @@ -33,9 +34,9 @@ push-gitlab-registry: - docker push $IMAGE_TAG push-docker-hub-registry: - image: docker:19.03.12 + image: docker:20.10.12 services: - - docker:19.03.12-dind + - docker:20.10.12-dind stage: push script: - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_TOKEN diff --git a/Dockerfile b/Dockerfile index ff52596..8cd15a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge as builder +FROM alpine:3 as builder ARG VERSION=1.4.230 @@ -34,7 +34,7 @@ RUN \ cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \ make -j $(nproc) -FROM alpine:edge +FROM alpine:3 RUN \ apk update -q --no-cache && \