Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed references to docker.io #1812

Merged
merged 1 commit into from
Mar 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,21 @@ on:
jobs:
build-and-push:
name: Deploy Docker Image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v3.4.0

- name: Build and push
uses: openzim/docker-publish-action@v9
uses: openzim/docker-publish-action@v10
with:
image-name: openzim/mwoffliner
on-master: dev
tag-pattern: /^v([0-9.]+)$/
latest-on-tag: true
restrict-to: openzim/mwoffliner
registries: ghcr.io
credentials: |
DOCKERIO_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
DOCKERIO_TOKEN=${{ secrets.DOCKERHUB_PASSWORD }}
GHCRIO_USERNAME=${{ secrets.GHCR_USERNAME }}
GHCRIO_TOKEN=${{ secrets.GHCR_TOKEN }}
repo_description: auto
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MWoffliner development.
[![NPM](https://nodei.co/npm/mwoffliner.png)](https://www.npmjs.com/package/mwoffliner)

[![npm](https://img.shields.io/npm/v/mwoffliner.svg)](https://www.npmjs.com/package/mwoffliner)
[![Docker Image](https://img.shields.io/docker/v/openzim/mwoffliner?arch=amd64&label=docker&sort=semver)](https://hub.docker.com/r/openzim/mwoffliner)
[![Docker](https://ghcr-badge.deta.dev/openzim/mwoffliner/latest_tag?label=docker)](https://ghcr.io/openzim/mwoffliner)
[![Build Status](https://github.com/openzim/mwoffliner/workflows/CI/badge.svg?query=branch%3Amain)](https://github.com/openzim/mwoffliner/actions/workflows/ci.yml?query=branch%3Amain)
[![codecov](https://codecov.io/gh/openzim/mwoffliner/branch/main/graph/badge.svg)](https://codecov.io/gh/openzim/mwoffliner)
[![CodeFactor](https://www.codefactor.io/repository/github/openzim/mwoffliner/badge)](https://www.codefactor.io/repository/github/openzim/mwoffliner)
Expand Down
10 changes: 5 additions & 5 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This bundled redis server is configured to be used only through a unix socket an
Use of this bundled server is transparent as `mwoffliner` command is aliased to `mwoffliner --redis /dev/shm/redis.sock`.

``` sh
docker run -ti openzim/mwoffliner mwoffliner --help
docker run -ti ghcr.io/openzim/mwoffliner mwoffliner --help
```

## With dedicated redis
Expand All @@ -29,14 +29,14 @@ $docker run --name=redis -d redis
... and then run the moffliner interactively (remember to specify `--redis` in command):

```
$docker run --link=redis:redis --name=mwoffliner -ti openzim/mwoffliner
$docker run --link=redis:redis --name=mwoffliner -ti ghcr.io/openzim/mwoffliner
```

... or non-interactively, directly with a command line (this is an
example, the second line is the mwoffliner command itself):

```
docker run --link=redis:redis --name=mwoffliner -e REDIS="redis://redis" openzim/mwoffliner \
docker run --link=redis:redis --name=mwoffliner -e REDIS="redis://redis" ghcr.io/openzim/mwoffliner \
mwoffliner --verbose --mwUrl=https://en.wikipedia.org/ --adminEmail=foo@bar.net
```

Expand All @@ -52,5 +52,5 @@ docker-compose --file docker-compose.yml run mwoffliner

Run from the repository root:
```
docker build . -f docker/Dockerfile -t openzim/mwoffliner
```
docker build . -f docker/Dockerfile -t ghcr.io/openzim/mwoffliner
```