From 4d03f238bbfdbdb075912cf92ed8c95976cff9a4 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Mon, 13 Mar 2023 06:09:43 +0100 Subject: [PATCH] CI: fix for docker buildx --- .gitlab-ci.yml | 1 - Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a83e69..003a8ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,6 @@ build_docker: image: docker:latest services: ['docker:dind'] variables: - DOCKER_DRIVER: vfs # overlay2 is not available on ZFS DOCKER_TLS_CERTDIR: "" script: - 'docker build --pull -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}" -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}" .' diff --git a/Dockerfile b/Dockerfile index b391514..e393f73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN pacman-key --init && \ android-tools openssh inetutils \ parted -RUN sed -i "s/EUID == 0/EUID == -1/g" $(which makepkg) +RUN sed -i "s/EUID == 0/EUID == -1/g" "$(which makepkg)" RUN yes | pacman -Scc