Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to run docker lint on every PR #62

Merged
merged 8 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/test_docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,10 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Verify that the Docker compose builds
run: docker compose config
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
3 changes: 3 additions & 0 deletions isb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion solr/Dockerfile
Original file line number Diff line number Diff line change
@@ -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