diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index f5ccf1051..a4b96b8ef 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -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 }} \ No newline at end of file + tags: ${{ secrets.DOCKERHUB_USERNAME }}/parseable:edge diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 26f5a2c4e..1f33c1ff2 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -8,10 +8,6 @@ on: - 'assets/**' - '**.md' -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - jobs: docker-compose-test: @@ -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 diff --git a/docker-compose.yaml b/docker-compose.yaml index 9ca46c106..b1316c8b7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,6 @@ version: "3.7" networks: parseable-internal: - driver: bridge services: minio: @@ -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