Skip to content

Commit

Permalink
#146 Update base images
Browse files Browse the repository at this point in the history
  • Loading branch information
docktermj committed May 29, 2024
1 parent 985b68e commit 1082745
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Stages
# -----------------------------------------------------------------------------

ARG IMAGE_GO_BUILDER=golang:1.21.4-bullseye
ARG IMAGE_FINAL=senzing/senzingapi-runtime:3.8.0
ARG IMAGE_GO_BUILDER=golang:1.22.3-bullseye
ARG IMAGE_FINAL=senzing/senzingapi-runtime:3.10.1

# -----------------------------------------------------------------------------
# Stage: senzingapi_runtime
Expand All @@ -16,7 +16,7 @@ FROM ${IMAGE_FINAL} as senzingapi_runtime
# -----------------------------------------------------------------------------

FROM ${IMAGE_GO_BUILDER} as go_builder
ENV REFRESHED_AT=2023-12-04
ENV REFRESHED_AT=2024-06-01
LABEL Name="senzing/template-go-builder" \
Maintainer="support@senzing.com" \
Version="0.0.1"
Expand Down Expand Up @@ -50,10 +50,11 @@ RUN mkdir -p /output \
# -----------------------------------------------------------------------------

FROM ${IMAGE_FINAL} as final
ENV REFRESHED_AT=2023-12-04
ENV REFRESHED_AT=2024-06-01
LABEL Name="senzing/template-go" \
Maintainer="support@senzing.com" \
Version="0.0.1"
HEALTHCHECK CMD ["/app/healthcheck.sh"]

# Copy local files from the Git repository.

Expand All @@ -63,15 +64,12 @@ COPY ./rootfs /

COPY --from=go_builder "/output/linux/template-go" "/app/template-go"

HEALTHCHECK CMD ["/app/healthcheck.sh"]

# Runtime environment variables.

ENV LD_LIBRARY_PATH=/opt/senzing/g2/lib/

# Runtime execution.

USER 1001

WORKDIR /app
ENTRYPOINT ["/app/template-go"]
16 changes: 11 additions & 5 deletions package.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Stages
# -----------------------------------------------------------------------------

ARG IMAGE_SENZINGAPI_RUNTIME=senzing/senzingapi-runtime:3.8.0
ARG IMAGE_GO_BUILDER=golang:1.21.4-bullseye
ARG IMAGE_SENZINGAPI_RUNTIME=senzing/senzingapi-runtime:3.10.1
ARG IMAGE_GO_BUILDER=golang:1.22.3-bullseye
ARG IMAGE_FPM_BUILDER=dockter/fpm:latest
ARG IMAGE_FINAL=alpine

Expand All @@ -18,7 +18,7 @@ FROM ${IMAGE_SENZINGAPI_RUNTIME} as senzingapi_runtime
# -----------------------------------------------------------------------------

FROM ${IMAGE_GO_BUILDER} as go_builder
ENV REFRESHED_AT=2023-08-01
ENV REFRESHED_AT=2025-06-01
LABEL Name="senzing/template-go-builder" \
Maintainer="support@senzing.com" \
Version="0.0.1"
Expand Down Expand Up @@ -57,7 +57,7 @@ RUN mkdir -p /output \
# -----------------------------------------------------------------------------

FROM ${IMAGE_FPM_BUILDER} as fpm_builder
ENV REFRESHED_AT=2023-08-01
ENV REFRESHED_AT=2024-06-01
LABEL Name="senzing/template-go-fpm-builder" \
Maintainer="support@senzing.com" \
Version="0.0.1"
Expand Down Expand Up @@ -101,10 +101,15 @@ RUN fpm \
# -----------------------------------------------------------------------------

FROM ${IMAGE_FINAL} as final
ENV REFRESHED_AT=2023-08-01
ENV REFRESHED_AT=2024-06-01
LABEL Name="senzing/template-go" \
Maintainer="support@senzing.com" \
Version="0.0.1"
HEALTHCHECK CMD ["/app/healthcheck.sh"]

# Copy local files from the Git repository.

COPY ./rootfs /

# Use arguments from prior stage.

Expand All @@ -115,4 +120,5 @@ ARG PROGRAM_NAME
COPY --from=fpm_builder "/output/*" "/output/"
COPY --from=fpm_builder "/output/linux-amd64/${PROGRAM_NAME}" "/output/linux-amd64/${PROGRAM_NAME}"

USER 1001
CMD ["/bin/bash"]

0 comments on commit 1082745

Please sign in to comment.