Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • build-docker/debian
1 result
Show changes
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
bullseye/x86/Dockerfile
View file @ ac76f4a4
...@@ -23,7 +23,7 @@ RUN groupadd -g 1000 build \ ...@@ -23,7 +23,7 @@ RUN groupadd -g 1000 build \
&& chown build.build /usr/local/bin && chown build.build /usr/local/bin
RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
RUN icinga-provide-go RUN icinga-provide-go 386
USER build USER build
ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
CMD ["icinga-build-package"] CMD ["icinga-build-package"]
buster/x86/Dockerfile
View file @ ac76f4a4
...@@ -23,7 +23,7 @@ RUN groupadd -g 1000 build \ ...@@ -23,7 +23,7 @@ RUN groupadd -g 1000 build \
&& chown build.build /usr/local/bin && chown build.build /usr/local/bin
RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
RUN icinga-provide-go RUN icinga-provide-go 386
USER build USER build
ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
CMD ["icinga-build-package"] CMD ["icinga-build-package"]
image.mk
View file @ ac76f4a4
...@@ -22,11 +22,10 @@ endif ...@@ -22,11 +22,10 @@ endif
all: pull build all: pull build
pull: pull:
docker pull "$(IMAGE):$(VARIANT)" || true
docker pull "$(FROM)" docker pull "$(FROM)"
build: build:
docker build --cache-from "$(IMAGE):$(VARIANT)" --tag "$(IMAGE):$(VARIANT)" . docker build --tag "$(IMAGE):$(VARIANT)" .
ifdef IMAGE_EXTRA_TAG ifdef IMAGE_EXTRA_TAG
docker tag "$(IMAGE):$(VARIANT)" "$(IMAGE):$(IMAGE_EXTRA_TAG)" docker tag "$(IMAGE):$(VARIANT)" "$(IMAGE):$(IMAGE_EXTRA_TAG)"
endif endif
......
stretch/x86/Dockerfile
View file @ ac76f4a4
...@@ -22,7 +22,7 @@ RUN groupadd -g 1000 build \ ...@@ -22,7 +22,7 @@ RUN groupadd -g 1000 build \
&& chown build.build /usr/local/bin && chown build.build /usr/local/bin
RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
RUN icinga-provide-go RUN icinga-provide-go 386
USER build USER build
ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
CMD ["icinga-build-package"] CMD ["icinga-build-package"]