-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33 from LeidenUniversityLibrary/docker-image-labels
Set Docker image labels in the correct build stage
- Loading branch information
Showing
1 changed file
with
3 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ ARG FTP_VERSION=development | |
# Clone the repository | ||
ADD ${REPO}#${FTP_VERSION} /fromthepage | ||
WORKDIR /fromthepage | ||
RUN echo "${FTP_VERSION}" > revision.txt | ||
COPY production.rb /fromthepage/config/environments/ | ||
COPY database.yml /fromthepage/config/database.yml | ||
RUN --mount=type=bind,source=fix-routes.txt,target=/fromthepage/fix-routes.txt \ | ||
|
@@ -40,8 +41,6 @@ RUN echo "gem 'ffi', '< 1.17'" >> Gemfile | |
FROM ruby27-base AS build | ||
ARG BUNDLER_VERSION=2.4.22 | ||
ARG DEBIAN_FRONTEND=noninteractive | ||
LABEL org.opencontainers.image.authors="Ben Companjen <[email protected]>" | ||
LABEL org.opencontainers.image.source="https://github.com/LeidenUniversityLibrary/fromthepage-podman" | ||
|
||
# Install build deps for gems installed by bundler | ||
RUN apt-get update -qq && \ | ||
|
@@ -83,6 +82,8 @@ RUN SECRET_KEY_BASE_DUMMY=1 bundle exec rails assets:precompile | |
|
||
# ------------------ | ||
FROM ruby27-base AS production | ||
LABEL org.opencontainers.image.authors="Ben Companjen <[email protected]>" | ||
LABEL org.opencontainers.image.source="https://github.com/LeidenUniversityLibrary/fromthepage-podman" | ||
|
||
RUN apt-get update -qq && \ | ||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ | ||
|