From 1a52e7f6e4874e124a4e842f7bf62577cedbfbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 9 May 2022 20:51:22 +0200 Subject: [PATCH] testing --- .gitlab-ci.yml | 2 +- assets/linux.mk | 2 +- assets/macos.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c20df9..1f73d60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ Build Docker Images: # Build container script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - make docker-$DISTRO + - DOCKER_HOST="tcp://docker:2375" make docker-$DISTRO - docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest Build: diff --git a/assets/linux.mk b/assets/linux.mk index b6b403c..3d02d7f 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo " outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2 docker : - docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile + docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile build : $(outfile) $(outfile).sha256sum diff --git a/assets/macos.mk b/assets/macos.mk index ddc1c4e..d6ba4af 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo " outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg docker : - docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile + docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile build : $(outfile) $(outfile).sha256sum