Skip to content

Commit f223f2c

Browse files
authored
Push to Docker Hub on each merge and fix ci (#298)
1 parent c9e53c5 commit f223f2c

File tree

3 files changed

+16
-34
lines changed

3 files changed

+16
-34
lines changed

.github/workflows/build-push.yaml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
1-
name: Build and publish a Docker image to GHCR
1+
name: Build and push to Docker Hub
22

33
on:
44
push:
55
branches: ['main']
66

7-
env:
8-
REGISTRY: ghcr.io
9-
IMAGE_NAME: ${{ github.repository }}
10-
117
jobs:
128

139
build-and-push-image:
14-
name: Build and push Docker image to GitHub Container Registry
10+
name: Build and push to Docker Hub
1511
runs-on: ubuntu-latest
16-
permissions:
17-
contents: read
18-
packages: write
1912
steps:
20-
- name: Checkout repository
13+
- name: Checkout
2114
uses: actions/checkout@v3
22-
- name: Log in to the Container registry
23-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
24-
with:
25-
registry: ${{ env.REGISTRY }}
26-
username: ${{ github.actor }}
27-
password: ${{ secrets.GITHUB_TOKEN }}
28-
- name: Extract metadata (tags, labels) for Docker
29-
id: meta
30-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
15+
- name: Login to Docker Hub
16+
uses: docker/login-action@v2
3117
with:
32-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
33-
- name: Build and push Docker image
34-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
18+
username: ${{ secrets.DOCKERHUB_USERNAME }}
19+
password: ${{ secrets.DOCKERHUB_TOKEN }}
20+
- name: Set up Docker Buildx
21+
uses: docker/setup-buildx-action@v2
22+
- name: Build and push
23+
uses: docker/build-push-action@v4
3524
with:
3625
context: .
26+
file: ./Dockerfile
3727
push: true
38-
tags: ${{ steps.meta.outputs.tags }}
39-
labels: ${{ steps.meta.outputs.labels }}
28+
tags: ${{ secrets.DOCKERHUB_USERNAME }}/parseable:edge

.github/workflows/integration-test.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ on:
88
- 'assets/**'
99
- '**.md'
1010

11-
env:
12-
REGISTRY: ghcr.io
13-
IMAGE_NAME: ${{ github.repository }}
14-
1511
jobs:
1612

1713
docker-compose-test:
@@ -21,7 +17,7 @@ jobs:
2117
- name: Checkout
2218
uses: actions/checkout@v3
2319
- name: Start compose
24-
run: docker-compose up --build --exit-code-from quest quest
20+
run: docker-compose up --build --exit-code-from quest quest
2521
- name: Stop compose
2622
if: always()
2723
run: docker-compose down

docker-compose.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ version: "3.7"
22

33
networks:
44
parseable-internal:
5-
driver: bridge
65

76
services:
87
minio:
@@ -11,16 +10,14 @@ services:
1110
- sh
1211
- -euc
1312
- |
14-
mkdir -p /data/parseable && \
15-
minio server /data
13+
mkdir -p /tmp/minio/parseable && \
14+
minio server /tmp/minio
1615
environment:
1716
- MINIO_ROOT_USER=parseable
1817
- MINIO_ROOT_PASSWORD=supersecret
1918
- MINIO_UPDATE=off
2019
ports:
2120
- 9000
22-
volumes:
23-
- /tmp/data/minio:/data
2421
healthcheck:
2522
test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
2623
interval: 15s

0 commit comments

Comments
 (0)