skobkin/docker-murmur
1
0
Fork 0
mirror of https://gitlab.com/skobkin/docker-murmur.git synced 2024-10-31 17:23:32 +00:00
Code Issues Projects Releases Wiki Activity

Reverting alpine image version. Trying to fix invalid bug with Docker In Docker and MUSL.

Browse source
This commit is contained in:
Alexey Skobkin 2022-01-20 04:16:21 +03:00
parent 17d54aab7c
commit dd60546fba
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.gitlab-ci.yml
View file

@ -10,9 +10,10 @@ variables:
DOCKER_HUB_TOKEN: "xxx" DOCKER_HUB_TOKEN: "xxx"
build: 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: services:
- docker:19.03.12-dind - docker:20.10.12-dind
stage: build stage: build
script: script:
- docker build -t $BUILT_IMAGE_TAG --no-cache . - docker build -t $BUILT_IMAGE_TAG --no-cache .
@ -22,9 +23,9 @@ build:
- images.tar - images.tar
push-gitlab-registry: push-gitlab-registry:
image: docker:19.03.12 image: docker:20.10.12
services: services:
- docker:19.03.12-dind - docker:20.10.12-dind
stage: push stage: push
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@ -33,9 +34,9 @@ push-gitlab-registry:
- docker push $IMAGE_TAG - docker push $IMAGE_TAG
push-docker-hub-registry: push-docker-hub-registry:
image: docker:19.03.12 image: docker:20.10.12
services: services:
- docker:19.03.12-dind - docker:20.10.12-dind
stage: push stage: push
script: script:
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_TOKEN - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_TOKEN

4
Dockerfile
View file

@ -1,4 +1,4 @@
FROM alpine:edge as builder FROM alpine:3 as builder
ARG VERSION=1.4.230 ARG VERSION=1.4.230
@ -34,7 +34,7 @@ RUN \
cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \ cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \
make -j $(nproc) make -j $(nproc)
FROM alpine:edge FROM alpine:3
RUN \ RUN \
apk update -q --no-cache && \ apk update -q --no-cache && \