Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Loudbooks committed Dec 6, 2024
2 parents 5e08c21 + 9b301cf commit 8b1b5df
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,20 @@ jobs:
uses: docker/build-push-action@v3
with:
context: ./frontend
build-args: |
COMMIT_HASH=${{ env.hash }}
file: ./frontend/Dockerfile
push: true
tags: ${{ secrets.DOCKER_USERNAME }}/pastebook-frontend:latest
tags: |
${{ secrets.DOCKER_USERNAME }}/pastebook-frontend:latest
${{ secrets.DOCKER_USERNAME }}/pastebook-frontend:${{ env.hash }}
- name: Build and push backend Docker image to Docker Hub
uses: docker/build-push-action@v3
with:
context: ./backend
file: ./backend/Dockerfile
push: true
tags: ${{ secrets.DOCKER_USERNAME }}/pastebook-backend:latest
tags: |
${{ secrets.DOCKER_USERNAME }}/pastebook-backend:latest
${{ secrets.DOCKER_USERNAME }}/pastebook-backend:${{ env.hash }}
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Start by creating a file named `docker-compose.yml`. Add the content below.
```yml
services:
backend:
image: ghcr.io/loudbook/pastebook-backend:latest
image: ghcr.io/loudbooks/pastebook-backend:latest
ports:
- "8080:8080"
environment:
Expand All @@ -29,12 +29,12 @@ services:
- pastebook-network

frontend:
image: ghcr.io/loudbook/pastebook-frontend:latest
image: ghcr.io/loudbooks/pastebook-frontend:latest
ports:
- "3000:3000"
environment:
- TITLE=PasteBook
- DESCRIPTION=PasteBook is an aesthetic, effortless way to share your blocks of text, and respects your privacy by automatically deleting your pastes.
- TITLE=
- DESCRIPTION=
depends_on:
- backend
networks:
Expand Down Expand Up @@ -62,7 +62,10 @@ networks:
driver: bridge
```
### Configuration
All of the following values must be changed.
> [!CAUTION]
> Do not change any prefilled configurations other than ones listen below. You will break things.
**Required configurations:**
<br>
`S3_ACCESS_KEY_ID` - The access key associated with your R2 bucket, S3 bucket, etc.
Expand All @@ -71,6 +74,12 @@ All of the following values must be changed.

`S3_ENDPOINT` - The endpoint associated with your R2 bucket, S3 bucket, etc.

**Optional configurations:**
<br>
`TITLE` - The title to be used around PasteBook.

`DESCRIPTION` - The description to be used in embeds and on the home page of PasteBook.

### Creation
Run the following.
```
Expand Down

0 comments on commit 8b1b5df

Please sign in to comment.