Merge branch 'v15.4'

.gitlab-ci.yml

@@ -18,8 +18,8 @@ before_script:
     - make -C ${CI_JOB_NAME}
     - '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push'
 
-'15.3':
+'15.4':
   <<: *build_job
 
-'15.2':
+'15.3':
   <<: *build_job

15.2/Dockerfile → 15.4/Dockerfile

-FROM opensuse/leap:15.2
+FROM opensuse/leap:15.4
 
 RUN zypper refresh -f \
  && zypper update -y \
@@ -13,9 +13,8 @@ RUN zypper --non-interactive install --no-recommends \
   cmake libopenssl-devel ccache \
  && zypper clean
 
-RUN OBS_DIST=openSUSE_Leap_15.2 \
- && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/icinga/"${OBS_DIST}"/home:icinga.repo \
- && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo \
+RUN zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/icinga/15.4/home:icinga.repo \
+ && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo_c \
  && zypper clean -a
 
 RUN rpm --import https://packages.icinga.com/icinga.key \

Makefile

-all:
-	$(MAKE) -C 15.2
-	$(MAKE) -C 15.3
+TARGETS := $(patsubst %/Dockerfile,%,$(wildcard */Dockerfile))
+PUSH_TARGETS := $(patsubst %,%-push,$(TARGETS))
 
-push:
-	$(MAKE) -C 15.2 push
-	$(MAKE) -C 15.3 push
+.PHONY: $(TARGETS)
+
+all: $(TARGETS)
+
+$(TARGETS):
+	$(MAKE) -C $@
+
+$(PUSH_TARGETS):
+	$(MAKE) -C $@ push