Verified Commit b48a2b23 authored by Michal Nowak's avatar Michal Nowak
Browse files

Move Makefile to docker directory

parent b13a8378
......@@ -51,7 +51,7 @@ stages:
.docker_image_job: &docker_image_job
<<: *image_job
script:
- VERSIONS="$VERSIONS" DISTROS="$DISTROS" ARCHS="$ARCHS" CI_REGISTRY_IMAGE="$CI_REGISTRY_IMAGE" KYUA_GIT_COMMIT="$KYUA_GIT_COMMIT" make $TARGET # -j $(getconf _NPROCESSORS_ONLN)
- VERSIONS="$VERSIONS" DISTROS="$DISTROS" ARCHS="$ARCHS" CI_REGISTRY_IMAGE="$CI_REGISTRY_IMAGE" KYUA_GIT_COMMIT="$KYUA_GIT_COMMIT" make -C docker/ $TARGET
.kvm_image_job: &kvm_image_job
<<: *image_job
......
......@@ -51,14 +51,14 @@ all: $(TARGETS)
packager-rpm: SOURCE_DIR = $(subst -,/,$@)
packager-rpm: CI_REGISTRY_NAME = $(subst -,:,$@)
packager-rpm:
docker build --no-cache -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "docker/$(SOURCE_DIR)"
docker build --no-cache -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "$(SOURCE_DIR)"
docker push "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)"
website-rsync_ssh_curl: SOURCE_DIR = $(subst -,/,$@)
website-rsync_ssh_curl: CI_REGISTRY_NAME = $(subst -,:,$@)
website-rsync_ssh_curl:
mkdir -p "docker/$(SOURCE_DIR)"
docker build --no-cache -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "docker/$(SOURCE_DIR)"
mkdir -p "$(SOURCE_DIR)"
docker build --no-cache -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "$(SOURCE_DIR)"
docker push "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)"
# Only push into the main image registry when built in the master branch
......@@ -85,7 +85,7 @@ $(TARGETS): SHELLCHECK = $(shellcheck_$(VERSION)_$(ARCH))
$(TARGETS): SOFTHSM = $(softhsm_$(VERSION)_$(ARCH))
$(TARGETS):
$(info Building $(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME) from $(SOURCE_IMAGE))
mkdir -p docker/bind9/$@
mkdir -p bind9/$@
sed \
-e 's,@ABI_CHECK@,$(ABI_CHECK),g' \
-e 's,@ARCH@,$(ARCH),g' \
......@@ -102,8 +102,8 @@ $(TARGETS):
-e 's,@VENDOR@,$(VENDOR),g' \
-e 's,@VERSION@,$(VERSION),g' \
-e 's,@[^@]*@,,g' \
< docker/bind9/$(VENDOR)-template/Dockerfile \
> docker/bind9/$@/Dockerfile
docker build --no-cache -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "docker/bind9/$@"
< bind9/$(VENDOR)-template/Dockerfile \
> bind9/$@/Dockerfile
docker build --no-cache -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "bind9/$@"
docker push "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)"
rm -rf docker/bind9/$@
rm -rf bind9/$@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment