Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
- remove digest hashes; replace with semvers
- update arcaflow-plugin-sdk
- regenerate the poetry lock file
- experiment with removing the requirements.txt file
  • Loading branch information
webbnh committed Aug 30, 2024
1 parent 56f39df commit 7e68391
Show file tree
Hide file tree
Showing 6 changed files with 277 additions and 271 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG package=arcaflow_plugin_elasticsearch
# 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.4.0@sha256:26f5d506f0750e0cad636afbe7ddd8cade09937eb5abae784096e46a1d4ae030 as build
FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase:0.4.2 as build
ARG package

COPY poetry.lock /app/
Expand All @@ -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.4.0@sha256:6674b5d2aa5de565b1d39a9c1694ad7ca15b57d06f33529bc3a6f4d6e76b100e
FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-osbase:0.4.2
ARG package

COPY --from=build /app/requirements.txt /app/
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.7'

services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4@sha256:dfd318b417be1356d9c7fdd6a5577c8a45553ac9d34354929a416c69c85daa9f
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
container_name: elasticsearch
environment:
- discovery.type=single-node
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.7'

services:
elasticsearch-integration:
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4@sha256:dfd318b417be1356d9c7fdd6a5577c8a45553ac9d34354929a416c69c85daa9f
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
container_name: elasticsearch.integration
environment:
- discovery.type=single-node
Expand Down
Loading

0 comments on commit 7e68391

Please sign in to comment.