diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 9bb6837..e848f4c 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -13,4 +13,10 @@ jobs: steps: - uses: actions/checkout@master - name: Verify that the Docker compose builds - run: docker compose config \ No newline at end of file + run: docker compose config + - name: Run projectatomic's dockerfile_lint on the iSB Dockerfile (https://github.com/projectatomic/dockerfile_lint) + run: docker run --rm -v $PWD:/root/ projectatomic/dockerfile-lint dockerfile_lint -f isb/Dockerfile + - name: Run projectatomic's dockerfile_lint on the Solr Dockerfile (https://github.com/projectatomic/dockerfile_lint) + run: docker run --rm -v $PWD:/root/ projectatomic/dockerfile-lint dockerfile_lint -f solr/Dockerfile + - name: Run projectatomic's dockerfile_lint on the PostgreSQL Dockerfile (https://github.com/projectatomic/dockerfile_lint) + run: docker run --rm -v $PWD:/root/ projectatomic/dockerfile-lint dockerfile_lint -f postgres/Dockerfile \ No newline at end of file diff --git a/isb/Dockerfile b/isb/Dockerfile index af4f812..6904a46 100644 --- a/isb/Dockerfile +++ b/isb/Dockerfile @@ -2,6 +2,9 @@ # Build the main Python app FROM python:3.11.6 AS main +LABEL name="iSamples in a Box Dockerfile" +LABEL version=0.1 + # unclear if this is needed -- probably not… # RUN pip3 install --upgrade pip WORKDIR /app diff --git a/postgres/Dockerfile b/postgres/Dockerfile index b1a1395..2765188 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -1,3 +1,7 @@ # syntax=docker/dockerfile:1 -FROM postgres:latest +FROM postgres:16.1 + +LABEL name="iSamples in a Box PostgreSQL Instance" +LABEL version=1.0 + COPY ./postgresql.conf /etc/postgresql.conf \ No newline at end of file diff --git a/solr/Dockerfile b/solr/Dockerfile index 4caabe0..724df0c 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -1,5 +1,9 @@ # syntax=docker/dockerfile:1 -FROM solr:latest +FROM solr:9.4.1 + +LABEL name="iSamples in a Box Solr Instance" +LABEL version=1.0 + COPY ./jts-core-1.15.0.jar /opt/solr/server/solr-webapp/webapp/WEB-INF/lib/ # this exposes the embedded zookeeper on the Docker network, so other services can talk to it (like the prometheus exporter) COPY ./zoo.cfg /opt/solr/server/solr/zoo.cfg \ No newline at end of file