Skip to content

Commit

Permalink
Push to Docker Hub on each merge and fix ci (#298)
Browse files Browse the repository at this point in the history
  • Loading branch information
nitisht authored Feb 19, 2023
1 parent c9e53c5 commit f223f2c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 34 deletions.
37 changes: 13 additions & 24 deletions .github/workflows/build-push.yaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,28 @@
name: Build and publish a Docker image to GHCR
name: Build and push to Docker Hub

on:
push:
branches: ['main']

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:

build-and-push-image:
name: Build and push Docker image to GitHub Container Registry
name: Build and push to Docker Hub
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
- name: Checkout
uses: actions/checkout@v3
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
tags: ${{ secrets.DOCKERHUB_USERNAME }}/parseable:edge
6 changes: 1 addition & 5 deletions .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ on:
- 'assets/**'
- '**.md'

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:

docker-compose-test:
Expand All @@ -21,7 +17,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Start compose
run: docker-compose up --build --exit-code-from quest quest
run: docker-compose up --build --exit-code-from quest quest
- name: Stop compose
if: always()
run: docker-compose down
7 changes: 2 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: "3.7"

networks:
parseable-internal:
driver: bridge

services:
minio:
Expand All @@ -11,16 +10,14 @@ services:
- sh
- -euc
- |
mkdir -p /data/parseable && \
minio server /data
mkdir -p /tmp/minio/parseable && \
minio server /tmp/minio
environment:
- MINIO_ROOT_USER=parseable
- MINIO_ROOT_PASSWORD=supersecret
- MINIO_UPDATE=off
ports:
- 9000
volumes:
- /tmp/data/minio:/data
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
interval: 15s
Expand Down

0 comments on commit f223f2c

Please sign in to comment.