Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cee10d4
feat: minimal changes to open a new PR and test the chatbot commands …
TheRustifyer Dec 21, 2024
23967e7
feat: removing third-party dependencies to trigger the workflow
TheRustifyer Dec 21, 2024
0ada6f2
feat: merged latest from develop
TheRustifyer Dec 21, 2024
d9036cb
Merge remote-tracking branch 'origin/develop' into feature/GH-7-revie…
TheRustifyer Dec 21, 2024
a958170
Merge remote-tracking branch 'origin/develop' into feature/GH-7-revie…
TheRustifyer Dec 21, 2024
440d09b
Merge remote-tracking branch 'origin/develop' into feature/GH-7-revie…
TheRustifyer Dec 21, 2024
f5b2109
Merge remote-tracking branch 'origin/develop' into feature/GH-7-revie…
TheRustifyer Dec 21, 2024
4bf8bf0
Merge remote-tracking branch 'origin/develop' into feature/GH-7-revie…
TheRustifyer Dec 21, 2024
e121878
Merge remote-tracking branch 'origin/develop' into feature/GH-7-revie…
TheRustifyer Dec 23, 2024
5e1ab50
fix(docker): Change context and paths
gbm25 Dec 23, 2024
62ded8e
chore(deploy-pre): Change command to build docker compose
gbm25 Dec 23, 2024
9a1b4b4
fix(deploy-pre): Fix commands for docker image.
gbm25 Dec 23, 2024
4309e7c
chore(deploy-pre): update checkout action to v4
gbm25 Dec 23, 2024
1b86a7a
fix(deploy-pre): Changed command to docker compose v2
gbm25 Dec 23, 2024
702ee83
fix(deploy-pre): Changed source paths
gbm25 Dec 23, 2024
768ce90
chore(deploy-pre): Update appleboy/scp-action to v0.1.7
gbm25 Dec 23, 2024
b456cf4
chore(deploy-pre): Remove docker buildx
gbm25 Dec 23, 2024
7167e6a
fix: SSH 'USERNAME' var
TheRustifyer Dec 23, 2024
850e92a
chore: only running the generated docker image
TheRustifyer Dec 23, 2024
2dc9e4e
chore: upgrading how we upload the docker image to run it on PRE
TheRustifyer Dec 23, 2024
c648fa5
fix: docker-compose for build the image
TheRustifyer Dec 23, 2024
915c871
feat: removing previous images to save space on disk
TheRustifyer Dec 23, 2024
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
51 changes: 28 additions & 23 deletions .github/workflows/deploy-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,50 @@ jobs:
runs-on: ubuntu-latest

steps:
# Step 1: Checkout the code
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker
uses: docker/setup-buildx-action@v2

- name: Build Docker Image
# Step 2: Build the Docker image using Docker Compose
- name: Build Docker Image with Docker Compose
run: |
docker build -t api-gateway:latest ./docker
docker compose -f ./docker/docker-compose.yml build
- name: Save Docker Image
# Step 3: Save and compress the Docker image
- name: Save and Compress Docker Image
run: |
docker save api-gateway:latest | gzip > api-gateway.tar.gz
docker save api-gateway:latest > api-gateway.tar.gz
- name: Copy Docker Image and Compose File to Droplet
uses: appleboy/[email protected]
# Step 4: Transfer compressed Docker image to the remote server
- name: Transfer Docker Image to Droplet
uses: appleboy/[email protected]
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USER }}
username: ${{ secrets.SSH_USERNAME }}
key: ${{ secrets.SSH_KEY }}
source: |
./api-gateway.tar.gz
./docker-compose.yml
target: /opt/api-gateway/
source: api-gateway.tar.gz
target: /opt/summoners-sync/api-gateway

- name: Deploy with Docker Compose
# Step 5: Load and run the Docker image on the remote server
- name: Deploy Docker Image on Remote
uses: appleboy/[email protected]
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USERNAME }}
key: ${{ secrets.SSH_KEY }}
script: |
cd /opt/api-gateway
set -e
# Stop and remove old services
docker-compose down || true
# Navigate to deployment directory
cd /opt/summoners-sync/api-gateway
# Stop and remove existing container if it exists
docker stop api-gateway || true
docker rm api-gateway || true
docker rmi api-gateway || true
# Load the new Docker image
gunzip -c api-gateway.tar.gz | docker load
# Load the Docker image
docker load < api-gateway.tar.gz
# Start the service with the new image
docker-compose up -d
# Run the new container
docker run -d --name api-gateway --restart always api-gateway:latest
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
FROM maven:3.9.9-ibm-semeru-23-jammy AS build
WORKDIR /app

COPY ../mvnw ./
COPY ../.mvn .mvn
COPY ../pom.xml ./
COPY ../src/ ./src
COPY mvnw ./
COPY .mvn .mvn
COPY pom.xml ./
COPY src/ ./src

RUN chmod +x mvnw && \
# ./mvnw clean install
Expand Down
3 changes: 2 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
version: "3.8"
services:
api-gateway:
container_name: api-gateway
build:
context: ..
dockerfile: docker/Dockerfile
image: api-gateway:latest
ports:
- "8080:8080"
environment:
Expand Down
Loading