Skip to content

Commit

Permalink
Merge pull request #6 from nlnwa/bump-versions
Browse files Browse the repository at this point in the history
Bump versions
  • Loading branch information
maeb authored Mar 26, 2023
2 parents a0008b7 + 9c3a724 commit f61006e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
type=ref,event=pr
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
push: false
tags: ${{ steps.meta.outputs.tags }}
Expand Down
9 changes: 1 addition & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
FROM busybox as warchaeology

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
RUN wget -O - https://github.com/nlnwa/warchaeology/releases/download/v0.4.1/warchaeology_Linux_x86_64.tar.gz | tar xvz && chmod +x warc


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


FROM python:3.11-alpine

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

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

RUN pip install warctools

COPY --from=warchaeology /warc /usr/local/bin/warc

COPY --from=jwrp /jhove-warc-report-parser /usr/local/bin/jhove-warc-report-parser

WORKDIR /veidemann
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2020 National Library of Norway

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down

0 comments on commit f61006e

Please sign in to comment.