Skip to content

Commit b040660

Browse files
committed
Push image to ghcr
1 parent 769ca6d commit b040660

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
make deploy-tags
3333
- name: master branch
3434
env:
35-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
36-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
35+
DOCKER_USERNAME: ${{ secrets.GHCR_USERNAME }}
36+
DOCKER_PASSWORD: ${{ secrets.GHCR_PASSWORD }}
3737
if: github.event_name == 'push' && contains(github.ref, '/heads/master')
3838
run: |
3939
make deploy-latest

Makefile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
PACKAGE := $(shell grep '^PACKAGE =' setup.py | cut -d "'" -f2)
55
VERSION := $(shell head -n 1 $(PACKAGE)/VERSION)
6+
DOCKER_IMAGE := ghcr.io/whiletrue-industries/datapackage-pipelines
67

78

89
all: list
@@ -37,27 +38,27 @@ version:
3738

3839
build:
3940
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
40-
docker pull frictionlessdata/datapackage-pipelines:latest &&\
41-
docker build -t frictionlessdata/datapackage-pipelines:latest --cache-from frictionlessdata/datapackage-pipelines . &&\
42-
docker build -t frictionlessdata/datapackage-pipelines:latest-alpine --cache-from frictionlessdata/datapackage-pipelines . &&\
43-
docker build -t frictionlessdata/datapackage-pipelines:${VERSION} --cache-from frictionlessdata/datapackage-pipelines . &&\
44-
docker build -t frictionlessdata/datapackage-pipelines:${VERSION}-alpine --cache-from frictionlessdata/datapackage-pipelines . &&\
45-
docker pull frictionlessdata/datapackage-pipelines:latest-slim &&\
46-
docker build -t frictionlessdata/datapackage-pipelines:latest-slim -f Dockerfile.slim --cache-from frictionlessdata/datapackage-pipelines:latest-slim . &&\
47-
docker build -t frictionlessdata/datapackage-pipelines:${VERSION}-slim -f Dockerfile.slim --cache-from frictionlessdata/datapackage-pipelines:latest-slim .
41+
docker pull $(DOCKER_IMAGE):latest &&\
42+
docker build -t $(DOCKER_IMAGE):latest --cache-from $(DOCKER_IMAGE) . &&\
43+
docker build -t $(DOCKER_IMAGE):latest-alpine --cache-from $(DOCKER_IMAGE) . &&\
44+
docker build -t $(DOCKER_IMAGE):${VERSION} --cache-from $(DOCKER_IMAGE) . &&\
45+
docker build -t $(DOCKER_IMAGE):${VERSION}-alpine --cache-from $(DOCKER_IMAGE) . &&\
46+
docker pull $(DOCKER_IMAGE):latest-slim &&\
47+
docker build -t $(DOCKER_IMAGE):latest-slim -f Dockerfile.slim --cache-from $(DOCKER_IMAGE):latest-slim . &&\
48+
docker build -t $(DOCKER_IMAGE):${VERSION}-slim -f Dockerfile.slim --cache-from $(DOCKER_IMAGE):latest-slim .
4849

4950

5051
deploy-latest:
5152
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" &&\
52-
docker push frictionlessdata/datapackage-pipelines:latest &&\
53-
docker push frictionlessdata/datapackage-pipelines:latest-alpine &&\
54-
docker push frictionlessdata/datapackage-pipelines:latest-slim
53+
docker push $(DOCKER_IMAGE):latest &&\
54+
docker push $(DOCKER_IMAGE):latest-alpine &&\
55+
docker push $(DOCKER_IMAGE):latest-slim
5556

5657
deploy-tags:
5758
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" &&\
58-
docker push frictionlessdata/datapackage-pipelines:${VERSION} &&\
59-
docker push frictionlessdata/datapackage-pipelines:${VERSION}-alpine &&\
60-
docker push frictionlessdata/datapackage-pipelines:${VERSION}-slim
59+
docker push $(DOCKER_IMAGE):${VERSION} &&\
60+
docker push $(DOCKER_IMAGE):${VERSION}-alpine &&\
61+
docker push $(DOCKER_IMAGE):${VERSION}-slim
6162

6263
deploy-pip:
6364
rm -rf dist/ || true

0 commit comments

Comments
 (0)