From 1e45256eb1a70104db365839be9b1d5806b1fa99 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Fri, 26 Jan 2024 16:12:00 -0700 Subject: [PATCH 1/8] This is a test broken file to see if CI catches it --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3e8c4a0..d47e3ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ version: "3.8" -services: +ervices: db: build: ./postgres/ shm_size: 1g From d6afdf6313151ad4e90b4e1486f83dddf5444025 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Fri, 26 Jan 2024 16:25:37 -0700 Subject: [PATCH 2/8] Fix build error --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d47e3ff..3e8c4a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ version: "3.8" -ervices: +services: db: build: ./postgres/ shm_size: 1g From 750b5e5f7785072b87e8d1573f93e76a437ed054 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Fri, 26 Jan 2024 16:29:09 -0700 Subject: [PATCH 3/8] Introduce error in sub Dockerfile --- isb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isb/Dockerfile b/isb/Dockerfile index af4f812..c95bb1c 100644 --- a/isb/Dockerfile +++ b/isb/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 # Build the main Python app -FROM python:3.11.6 AS main +ROM python:3.11.6 AS main # unclear if this is needed -- probably not… # RUN pip3 install --upgrade pip From db84a24b3e6c8798e36f6f3c8ad69da358314617 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Tue, 30 Jan 2024 10:45:09 -0700 Subject: [PATCH 4/8] Test out dockerfile_lint from project atomic in github CI (https://github.com/projectatomic/dockerfile_lint) --- .github/workflows/test_docker_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 9bb6837..5976cfe 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -13,4 +13,6 @@ 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 -it --rm -v $PWD:/root/ projectatomic/dockerfile-lint dockerfile_lint -f isb/Dockerfile \ No newline at end of file From ac3601304bb1da503448ebee5c8f4cd38a2c738d Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Tue, 30 Jan 2024 10:48:34 -0700 Subject: [PATCH 5/8] Fix "the input device is not a TTY" error --- .github/workflows/test_docker_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 5976cfe..3720754 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -15,4 +15,4 @@ jobs: - name: Verify that the Docker compose builds run: docker compose config - name: Run projectatomic's dockerfile_lint on the iSB Dockerfile (https://github.com/projectatomic/dockerfile_lint) - run: docker run -it --rm -v $PWD:/root/ projectatomic/dockerfile-lint dockerfile_lint -f isb/Dockerfile \ No newline at end of file + run: docker run --rm -v $PWD:/root/ projectatomic/dockerfile-lint dockerfile_lint -f isb/Dockerfile \ No newline at end of file From 25e13888446e6fa810a558c9389296b3331e3c37 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Tue, 30 Jan 2024 11:40:42 -0700 Subject: [PATCH 6/8] Correct errors in iSB Dockerfile, this should make the build green --- isb/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/isb/Dockerfile b/isb/Dockerfile index c95bb1c..6904a46 100644 --- a/isb/Dockerfile +++ b/isb/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 # Build the main Python app -ROM python:3.11.6 AS main +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 From d5707995b33ec76aad181f64bf304a9d94953de9 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Tue, 30 Jan 2024 11:48:00 -0700 Subject: [PATCH 7/8] Run against the solr Dockerfile, too --- .github/workflows/test_docker_build.yml | 4 +++- solr/Dockerfile | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 3720754..527080b 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -15,4 +15,6 @@ jobs: - name: Verify that the Docker compose builds 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 \ No newline at end of file + 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 \ 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 From 57d1c15620ff65548acf435ac71beec8c0ec43f7 Mon Sep 17 00:00:00 2001 From: Danny Mandel Date: Tue, 30 Jan 2024 11:51:25 -0700 Subject: [PATCH 8/8] Run the linter on postgres, too --- .github/workflows/test_docker_build.yml | 6 ++++-- postgres/Dockerfile | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 527080b..e848f4c 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -15,6 +15,8 @@ jobs: - name: Verify that the Docker compose builds 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 + 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 \ No newline at end of file + 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/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