Skip to content

Commit

Permalink
Merge pull request #86 from ciatph/dev
Browse files Browse the repository at this point in the history
v1.1.7
  • Loading branch information
ciatph authored Oct 2, 2024
2 parents d1635db + 625f37d commit 8019f64
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:

# Push the complete "app" Docker image
docker-build-push:
name: Deploy App to Docker Hub
name: Push App Docker
if: github.event.release.target_commitish == 'master'
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:

# Push the development (client/server) Docker images
docker-build-push-dev:
name: Deploy Development to Docker Hub
name: Push Dev Docker
if: github.event.release.target_commitish == 'master'
runs-on: ubuntu-latest
steps:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,13 @@ https://hub.docker.com/r/ciatphdev/firebase-users-server/tags

- Docker pull<br>
```
docker pull ciatphdev/firebase-users-client:dev
docker pull ciatphdev/firebase-users-server:dev
docker pull ciatphdev/firebase-users-client:latest
docker pull ciatphdev/firebase-users-server:latest
```
- Docker run (requires a `.env` file input parameter):<br>
```
docker run -it --rm --env-file .env -p 3000:3000 ciatphdev/firebase-users-client:dev
docker run -it --rm --env-file .env -p 3001:3001 ciatphdev/firebase-users-server:dev
docker run -it --rm --env-file .env -p 3000:3000 ciatphdev/firebase-users-client:latest
docker run -it --rm --env-file .env -p 3001:3001 ciatphdev/firebase-users-server:latest
```

## Deploy with GitHub Actions
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
# Create React App (CRA) running on development mode
client-dev:
container_name: client-dev
image: ciatphdev/firebase-users-client:dev
image: ciatphdev/firebase-users-client:latest
env_file:
- ./client/.env
build:
Expand All @@ -20,7 +20,7 @@ services:
# Express app running in development mode with auto reload using nodemon
server-dev:
container_name: server-dev
image: ciatphdev/firebase-users-server:dev
image: ciatphdev/firebase-users-server:latest
env_file:
- ./server/.env
build:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
# Build Create React App (CRA) website running on nginx container
client-prod:
container_name: client-prod
image: ciatphdev/firebase-users-client:latest
image: ciatphdev/firebase-users-client:prod
restart: always
env_file:
- ./client/.env
Expand All @@ -20,7 +20,7 @@ services:
# Express app (backend only) that restarts itself on errors using pm2
server-prod:
container_name: server-prod
image: ciatphdev/firebase-users-server:latest
image: ciatphdev/firebase-users-server:prod
restart: always
env_file:
- ./server/.env
Expand Down

0 comments on commit 8019f64

Please sign in to comment.