academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the build faster

Browse Source 
Re-use the go-toolset builder image which has the MQ SDK installed, for the C builder image, instead of re-installing the MQ SDK.

Also reduced the number of layers, as each layer was adding time to the build.
This commit is contained in:
arthur.barr@uk.ibm.com
2022-05-12 11:59:51 +01:00
committed by Arthur Barr
parent ae5b736f40
commit 7c58e2bea2
1 changed files with 48 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Dockerfile-server
View File

@@ -31,6 +31,7 @@ ARG IMAGE_TAG="Not specified"
ARG GO_WORKDIR ARG GO_WORKDIR
USER 0 USER 0
COPY install-mq.sh /usr/local/bin/ COPY install-mq.sh /usr/local/bin/
# Install the MQ SDK
RUN mkdir /opt/mqm \ RUN mkdir /opt/mqm \
&& chmod a+x /usr/local/bin/install-mq.sh \ && chmod a+x /usr/local/bin/install-mq.sh \
&& sleep 1 \ && sleep 1 \
@@ -43,21 +44,21 @@ COPY internal/ ./internal
COPY pkg/ ./pkg COPY pkg/ ./pkg
COPY vendor/ ./vendor COPY vendor/ ./vendor
ENV CGO_CFLAGS="-I/opt/mqm/inc/" \ ENV CGO_CFLAGS="-I/opt/mqm/inc/" \
CGO_LDFLAGS_ALLOW="-Wl,-rpath.*" CGO_LDFLAGS_ALLOW="-Wl,-rpath.*" \
ENV PATH="${PATH}:/opt/mqm/bin" PATH="${PATH}:/opt/mqm/bin"
RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" ./cmd/runmqserver/ RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" ./cmd/runmqserver/ \
RUN go build ./cmd/chkmqready/ && go build ./cmd/chkmqready/ \
RUN go build ./cmd/chkmqhealthy/ && go build ./cmd/chkmqhealthy/ \
RUN go build ./cmd/chkmqstarted/ && go build ./cmd/chkmqstarted/ \
RUN go build ./cmd/runmqdevserver/ && go build ./cmd/runmqdevserver/ \
RUN go test -v ./cmd/runmqdevserver/... && go test -v ./cmd/runmqdevserver/... \
RUN go test -v ./cmd/runmqserver/ && go test -v ./cmd/runmqserver/ \
RUN go test -v ./cmd/chkmqready/ && go test -v ./cmd/chkmqready/ \
RUN go test -v ./cmd/chkmqhealthy/ && go test -v ./cmd/chkmqhealthy/ \
RUN go test -v ./cmd/chkmqstarted/ && go test -v ./cmd/chkmqstarted/ \
RUN go test -v ./pkg/... && go test -v ./pkg/... \
RUN go test -v ./internal/... && go test -v ./internal/... \
RUN go vet ./cmd/... ./internal/... && go vet ./cmd/... ./internal/...
############################################################################### ###############################################################################
# Main build stage, to build MQ image # Main build stage, to build MQ image
@@ -68,18 +69,18 @@ ARG MQ_URL
ARG BASE_IMAGE ARG BASE_IMAGE
ARG BASE_TAG ARG BASE_TAG
ARG GO_WORKDIR ARG GO_WORKDIR
LABEL summary="IBM MQ Advanced Server" LABEL summary="IBM MQ Advanced Server" \
LABEL description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
LABEL vendor="IBM" vendor="IBM" \
LABEL maintainer="IBM" maintainer="IBM" \
LABEL distribution-scope="private" distribution-scope="private" \
LABEL authoritative-source-url="https://www.ibm.com/software/passportadvantage/" authoritative-source-url="https://www.ibm.com/software/passportadvantage/" \
LABEL url="https://www.ibm.com/products/mq/advanced" url="https://www.ibm.com/products/mq/advanced" \
LABEL io.openshift.tags="mq messaging" io.openshift.tags="mq messaging" \
LABEL io.k8s.display-name="IBM MQ Advanced Server" io.k8s.display-name="IBM MQ Advanced Server" \
LABEL io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
LABEL base-image=$BASE_IMAGE base-image=$BASE_IMAGE \
LABEL base-image-release=$BASE_TAG base-image-release=$BASE_TAG
COPY install-mq.sh /usr/local/bin/ COPY install-mq.sh /usr/local/bin/
COPY install-mq-server-prereqs.sh /usr/local/bin/ COPY install-mq-server-prereqs.sh /usr/local/bin/
# Install MQ. To avoid a "text file busy" error here, we sleep before installing. # Install MQ. To avoid a "text file busy" error here, we sleep before installing.
@@ -91,9 +92,6 @@ RUN env \
&& install-mq.sh \ && install-mq.sh \
&& /opt/mqm/bin/security/amqpamcf \ && /opt/mqm/bin/security/amqpamcf \
&& chown -R 1001:root /opt/mqm/* && chown -R 1001:root /opt/mqm/*
# Create a directory for runtime data from runmqserver
RUN mkdir -p /run/runmqserver \
&& chown 1001:root /run/runmqserver
COPY --from=builder $GO_WORKDIR/runmqserver /usr/local/bin/ COPY --from=builder $GO_WORKDIR/runmqserver /usr/local/bin/
COPY --from=builder $GO_WORKDIR/chkmq* /usr/local/bin/ COPY --from=builder $GO_WORKDIR/chkmq* /usr/local/bin/
COPY NOTICES.txt /opt/mqm/licenses/notices-container.txt COPY NOTICES.txt /opt/mqm/licenses/notices-container.txt
@@ -123,21 +121,14 @@ ENTRYPOINT ["runmqserver"]
############################################################################### ###############################################################################
# Build stage to build C code for custom authorization service (developer-only) # Build stage to build C code for custom authorization service (developer-only)
############################################################################### ###############################################################################
# User the Go toolset image, which already includes gcc # Use the Go toolset image, which already includes gcc and the MQ SDK
FROM $BUILDER_IMAGE:$BUILDER_TAG as cbuilder FROM builder as cbuilder
# The URL to download the MQ installer from in tar.gz format # The URL to download the MQ installer from in tar.gz format
# This assumes an archive containing the MQ Non-Install packages # This assumes an archive containing the MQ Non-Install packages
ARG MQ_URL ARG MQ_URL
USER 0 USER 0
# Install the Apache Portable Runtime code (used for htpasswd hash checking) # Install the Apache Portable Runtime code (used for htpasswd hash checking)
RUN yum --assumeyes --disableplugin=subscription-manager install apr-devel apr-util-openssl apr-util-devel RUN yum --assumeyes --disableplugin=subscription-manager install apr-devel apr-util-openssl apr-util-devel
# Install MQ client
COPY install-mq.sh /usr/local/bin/
RUN mkdir /opt/mqm \
&& chmod a+x /usr/local/bin/install-mq.sh \
&& sleep 1 \
&& INSTALL_SDK=1 install-mq.sh \
&& chown -R 1001:root /opt/mqm/*
COPY authservice/ /opt/app-root/src/authservice/ COPY authservice/ /opt/app-root/src/authservice/
WORKDIR /opt/app-root/src/authservice/mqhtpass WORKDIR /opt/app-root/src/authservice/mqhtpass
RUN make all RUN make all
@@ -149,31 +140,25 @@ FROM mq-server AS mq-dev-server
ARG BASE_IMAGE ARG BASE_IMAGE
ARG BASE_TAG ARG BASE_TAG
ARG GO_WORKDIR ARG GO_WORKDIR
# Enable MQ developer default configuration LABEL summary="IBM MQ Advanced for Developers Server" \
ENV MQ_DEV=true description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
LABEL summary="IBM MQ Advanced for Developers Server" vendor="IBM" \
LABEL description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" distribution-scope="private" \
LABEL vendor="IBM" authoritative-source-url="https://www.ibm.com/software/passportadvantage/" \
LABEL distribution-scope="private" url="https://www.ibm.com/products/mq/advanced" \
LABEL authoritative-source-url="https://www.ibm.com/software/passportadvantage/" io.openshift.tags="mq messaging" \
LABEL url="https://www.ibm.com/products/mq/advanced" io.k8s.display-name="IBM MQ Advanced for Developers Server" \
LABEL io.openshift.tags="mq messaging" io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
LABEL io.k8s.display-name="IBM MQ Advanced for Developers Server" base-image=$BASE_IMAGE \
LABEL io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" base-image-release=$BASE_TAG
LABEL base-image=$BASE_IMAGE
LABEL base-image-release=$BASE_TAG
USER 0 USER 0
COPY --from=cbuilder /opt/app-root/src/authservice/mqhtpass/build/mqhtpass.so /opt/mqm/lib64/ COPY --from=cbuilder /opt/app-root/src/authservice/mqhtpass/build/mqhtpass.so /opt/mqm/lib64/
COPY etc/mqm/*.ini /etc/mqm/ COPY etc/mqm/*.ini /etc/mqm/
COPY etc/mqm/mq.htpasswd /etc/mqm/ COPY etc/mqm/mq.htpasswd /etc/mqm/
RUN chmod 0660 /etc/mqm/mq.htpasswd
COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/ COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/
RUN chmod u+x /usr/local/bin/install-extra-packages.sh \ RUN chmod u+x /usr/local/bin/install-extra-packages.sh \
&& sleep 1 \ && sleep 1 \
&& install-extra-packages.sh && install-extra-packages.sh
# Create a directory for runtime data from runmqserver
RUN mkdir -p /run/runmqdevserver \
&& chown 1001:root /run/runmqdevserver
COPY --from=builder $GO_WORKDIR/runmqdevserver /usr/local/bin/ COPY --from=builder $GO_WORKDIR/runmqdevserver /usr/local/bin/
# Copy template files # Copy template files
COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/ COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/
@@ -182,10 +167,13 @@ COPY incubating/mqadvanced-server-dev/web /etc/mqm/web
RUN chown -R 1001:root /etc/mqm/* \ RUN chown -R 1001:root /etc/mqm/* \
&& chmod -R g+w /etc/mqm/web \ && chmod -R g+w /etc/mqm/web \
&& chmod +x /usr/local/bin/runmq* \ && chmod +x /usr/local/bin/runmq* \
&& chmod 0660 /etc/mqm/mq.htpasswd \
&& install --directory --mode 2775 --owner 1001 --group root /run/runmqdevserver && install --directory --mode 2775 --owner 1001 --group root /run/runmqdevserver
ENV MQ_ENABLE_EMBEDDED_WEB_SERVER=1 MQ_GENERATE_CERTIFICATE_HOSTNAME=localhost ENV MQ_DEV=true \
ENV LD_LIBRARY_PATH=/opt/mqm/lib64 MQ_ENABLE_EMBEDDED_WEB_SERVER=1 \
ENV MQ_CONNAUTH_USE_HTP=true MQ_GENERATE_CERTIFICATE_HOSTNAME=localhost \
ENV MQS_PERMIT_UNKNOWN_ID=true LD_LIBRARY_PATH=/opt/mqm/lib64 \
MQ_CONNAUTH_USE_HTP=true \
MQS_PERMIT_UNKNOWN_ID=true
USER 1001 USER 1001
ENTRYPOINT ["runmqdevserver"] ENTRYPOINT ["runmqdevserver"]