[evince/wip/gpoo/image-rebuild] build: Switch to Alpine
- From: Germán Poo-Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/wip/gpoo/image-rebuild] build: Switch to Alpine
- Date: Tue, 30 Aug 2022 11:10:39 +0000 (UTC)
commit 57d71a8db429132d642c8fb48e0e3c667cbc6ba9
Author: Germán Poo-Caamaño <gpoo gnome org>
Date: Mon Aug 29 18:45:21 2022 -0400
build: Switch to Alpine
.gitlab-ci.yml | 9 ++++++---
.gitlab-ci/ubuntu.Dockerfile | 3 +--
2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35807dbc1..cde3c6c7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,18 +67,21 @@ nightly:
update image:
variables:
- IMAGE_TAG: $CI_REGISTRY_IMAGE/x86_64-ubuntu:poppler
+ IMAGE_TAG: $CI_REGISTRY_IMAGE/x86_64-ubuntu
# Tell 'docker:dind' to enable TLS (recommended)
# and generate certificates in the specified directory.
DOCKER_TLS_CERTDIR: "/certs"
STORAGE_DRIVER: vfs
BUILDAH_FORMAT: docker
BUILDAH_ISOLATION: chroot
- image: registry.fedoraproject.org/fedora:latest
+ image: alpine:latest
stage: image
script:
- - dnf install -y buildah runc
+ - env
+ - apk add --no-cache buildah runc
- buildah bud --tag $IMAGE_TAG -f .gitlab-ci/ubuntu.Dockerfile
+ - buildah tag $IMAGE_TAG "$IMAGE_TAG:v$CI_JOB_ID"
+ - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
when: manual
# only:
# - web
diff --git a/.gitlab-ci/ubuntu.Dockerfile b/.gitlab-ci/ubuntu.Dockerfile
index cdd13830d..edad215d2 100644
--- a/.gitlab-ci/ubuntu.Dockerfile
+++ b/.gitlab-ci/ubuntu.Dockerfile
@@ -1,7 +1,6 @@
FROM ubuntu:22.04
-ENV LANG=C.UTF-8 STORAGE_DRIVER=vfs BUILDAH_FORMAT=docker \
- BUILDAH_ISOLATION=chroot DEBIAN_FRONTEND=noninteractive
+ENV LANG=C.UTF-8 DEBIAN_FRONTEND=noninteractive
RUN apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]