Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/docker-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ name: Docker Image Dev - Latest

on:
push:
branches: ["!master"]
pull_request:
branches: ["!master"]

jobs:
build:
if: github.ref != 'refs/heads/master'
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Login to DockerHub
uses: docker/login-action@v4
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
context: .
push: true
tags: themranderson/conversionapi:latest
8 changes: 6 additions & 2 deletions .github/workflows/docker-master.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
name: Docker Image Master - Stable

on:
pull_request:
push:
branches: ["master"]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: themranderson/conversionapi:stable