From 43c228099708280411c46ebbd0847692bfff2d88 Mon Sep 17 00:00:00 2001 From: Chris Soyars Date: Sat, 4 Dec 2021 09:51:39 -0800 Subject: [PATCH 1/2] github action: publish to ghcr and dockerhub --- .github/workflows/docker.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a9ea9405a..e3222fdb6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,17 +22,18 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Log in to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - -# - name: Extract metadata (tags, labels) for Docker -# id: meta -# uses: docker/metadata-action@v3 -# with: -# images: koush/scrypted + + - name: Login to Github Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker image uses: docker/build-push-action@v2 @@ -41,6 +42,6 @@ jobs: context: . platforms: linux/amd64,linux/arm64,linux/armhf push: true - tags: koush/scrypted:latest - # tags: ${{ steps.meta.outputs.tags }} - # labels: ${{ steps.meta.outputs.labels }} + tags: | + koush/scrypted:latest + ghcr.io/koush/scrypted:latest From 362dbdc6c74cf42ab27e1e6fb21b448b59ae3a36 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 4 Dec 2021 11:20:32 -0800 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e44fe3181..b03f46d27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM koush/opencv4nodejs +FROM koush/node-opencv # edge TPU RUN echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" | tee /etc/apt/sources.list.d/coral-edgetpu.list