Update all dependencies (#36)

* Update all dependencies Signed-off-by: redhat-renovate-bot <[email protected]> * Replace digest hashes with semver tags * Update docker-compose invocations * Work around Poetry bug --------- Signed-off-by: redhat-renovate-bot <[email protected]> Co-authored-by: Webb Scales <[email protected]>
arcalot · Aug 27, 2024 · de0fea8 · de0fea8
1 parent 740a2b9
commit de0fea8
Show file tree

Hide file tree

Showing 7 changed files with 305 additions and 272 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
       - name: Build image
-        run: docker-compose build 
+        run: docker compose build
       - name: Run plugin
-        run: docker-compose up --abort-on-container-exit
+        run: docker compose up --abort-on-container-exit
       - name: Extract coverage data
         run: |
           docker create --name test quay.io/arcalot/arcaflow-plugin-opensearch:latest
@@ -25,7 +25,7 @@ jobs:
           pip install html2text
           html2text --ignore-images --ignore-links -b 0 htmlcov/index.html >> $GITHUB_STEP_SUMMARY
       - name: Upload coverage results
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
+        uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: htmlcov

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ ARG package=arcaflow_plugin_opensearch
 # STAGE 1 -- Build module dependencies and run tests
 # The 'poetry' and 'coverage' modules are installed and verson-controlled in the
 # quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase image to limit drift
-FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase:0.3.1@sha256:9767207e2de6597c4d6bd2345d137ac03661326734d4e6824840d270d3415e12 as build
+FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase:0.4.2 as build
 ARG package
 
 COPY poetry.lock /app/
@@ -26,7 +26,7 @@ RUN python -m coverage run tests/unit/test_${package}.py \
 
 
 # STAGE 2 -- Build final plugin image
-FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-osbase:0.3.1@sha256:0e9384416ad5dd8810c410a87c283ca29a368fc85592378b85261fce5f9ecbeb
+FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-osbase:0.4.2
 ARG package
 
 COPY --from=build /app/requirements.txt /app/

diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@ A plugin for loading data into an OpenSearch-compatible instance.
 
 During the development of this plugin it is useful to start a local Elasticsearch via:
 ```bash
-docker-compose -f docker-compose-dev.yaml up -d
+docker compose -f docker-compose-dev.yaml up -d
 ```
 
 and stop it again via:
 ```bash
-docker-compose -f docker-compose-dev.yaml down -v
+docker compose -f docker-compose-dev.yaml down -v
 ```
 
 ## Testing
@@ -39,11 +39,11 @@ python -m unittest tests.integration.test_opensearch_plugin
 
 - using the [docker-compose.yaml](./docker-compose.yaml) and run
 ```bash
-# the --abort-on-container-exit ensures a docker-compose down after the tests have run
-docker-compose -f docker-compose.yaml up --abort-on-container-exit
+# the --abort-on-container-exit ensures a `docker compose down` after the tests have run
+docker compose -f docker-compose.yaml up --abort-on-container-exit
 ```
 
-__Note:__ Make sure to `docker-compose down` and remove the volume after one run as there is currently no cleanup done. 
+__Note:__ Make sure to `docker compose down` and remove the volume after one run as there is currently no cleanup done.
 
 # Autogenerated Input/Output Documentation by Arcaflow-Docsgen Below
 

diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1@sha256:a476af93763c9ca22f8b6d1f7dfad0b96304b69006aeeeda949912fe8263f604
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0
     container_name: elasticsearch
     environment:
       - discovery.type=single-node

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   elasticsearch-integration:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1@sha256:a476af93763c9ca22f8b6d1f7dfad0b96304b69006aeeeda949912fe8263f604
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0
     container_name: elasticsearch.integration
     environment:
       - discovery.type=single-node