Skip to content

Commit

Permalink
Merge pull request #5 from nlnwa/update
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
maeb authored Nov 18, 2022
2 parents 383f47e + 6f8519b commit a0008b7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ jobs:
steps:
- name: Extract metadata (tags, labels) and establish version
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=semver,pattern={{version}}
- name: Log in to the container registry (${{ env.REGISTRY }})
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
steps:
- name: Extract metadata (tags, labels) and establish version
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=pr
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: false
tags: ${{ steps.meta.outputs.tags }}
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
FROM busybox as warchaeology

ARG VERSION=0.1.0-RC.6
ARG VERSION=0.1.1
RUN wget -O warc https://github.com/nlnwa/warchaeology/releases/download/v${VERSION}/warc_linux_x86_64 \
&& chmod +x warc


FROM norsknettarkiv/jhove-warc-report-parser:0.1.0 as jwrp
FROM ghcr.io/nlnwa/jhove-warc-report-parser:0.1.2 as jwrp


FROM python:3.10-alpine
FROM python:3.11-alpine

LABEL maintainer="marius.beck@nb.no"

RUN apk add --no-cache jq curl gettext git tree
Expand Down

0 comments on commit a0008b7

Please sign in to comment.