Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0758b56
create ci/cd
spilt-tea Mar 25, 2025
b3be592
switch ci to install
spilt-tea Mar 25, 2025
1745a2a
lol forgot to change all wkdirs in ci
spilt-tea Mar 25, 2025
4db8df7
add build to server dockerfile
spilt-tea Mar 25, 2025
2aa3af8
fix dir for init sql and rm server start cmd
spilt-tea Mar 25, 2025
75b2104
switch pipeline to docker env for testing
spilt-tea Mar 25, 2025
14c2d1f
switch to mac os image and add pre cmds
spilt-tea Mar 25, 2025
404a665
change line in ci
spilt-tea Mar 25, 2025
bf4a43a
again
spilt-tea Mar 25, 2025
4226632
bah
spilt-tea Mar 25, 2025
2139dc2
another one
spilt-tea Mar 25, 2025
6258746
chain the commands
spilt-tea Mar 25, 2025
6a306bf
...
spilt-tea Mar 26, 2025
97f7535
alr remove the build cmd
spilt-tea Mar 26, 2025
41f300a
...
spilt-tea Mar 26, 2025
1ed9ab8
adding compose and docker from source
spilt-tea Mar 26, 2025
cd80b53
change flags in dc file
spilt-tea Mar 26, 2025
059ef35
put always back
spilt-tea Mar 26, 2025
43a4474
change the dc
spilt-tea Mar 26, 2025
62d5b4f
added a -d flag
spilt-tea Mar 26, 2025
48fdce6
misspelled cmd
spilt-tea Mar 26, 2025
2e5516b
change root dir in jest config
spilt-tea Mar 26, 2025
af935e1
add more
spilt-tea Mar 26, 2025
ddc371b
remove everything
spilt-tea Mar 26, 2025
30c11ed
...
spilt-tea Mar 26, 2025
fac628c
add more cmds
spilt-tea Mar 26, 2025
13aeba3
add npm install
spilt-tea Mar 26, 2025
9b583bf
rm 3000
spilt-tea Mar 26, 2025
c1f66c1
...
spilt-tea Mar 26, 2025
7b65593
....
spilt-tea Mar 26, 2025
f26630f
...
spilt-tea Mar 26, 2025
1adbbe4
change step names
spilt-tea Mar 26, 2025
8f67989
remove redundant build cmd
spilt-tea Mar 26, 2025
74ca44b
add back in install?
spilt-tea Mar 26, 2025
414f0dc
...
spilt-tea Mar 26, 2025
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: 51 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: CI/CD Pipeline

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest

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

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

- name: Install Docker Compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/v2.3.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
docker-compose --version
continue-on-error: false

- name: Build Docker Containers (Server and DB)
run: |
docker-compose -f docker-compose.base.yml build

- name: Run Docker Containers
run: |
docker-compose -f docker-compose.base.yml up -d

- name: Build the Server within the Docker Image
run: |
docker exec server-1 npm run build

- name: Run tests
run: |
docker exec server-1 npm run test

# - name: Linting
# run: |
# docker exec server-1 npm run lint

- name: Teardown Docker Environment
run: |
docker-compose -f docker-compose.base.yml down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
FROM node:alpine
WORKDIR /home/node/app
COPY . .
RUN npm install
EXPOSE 3000
RUN npm install
# EXPOSE 3000
7 changes: 3 additions & 4 deletions docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ services:
ports:
- "5433:5433"
healthcheck:
test: ['CMD-SHELL', 'pg_isready -U postgres -d button-db']
test: ['CMD-SHELL', 'pg_isready -U postgres']
interval: 5s
timeout: 5s
retries: 5
volumes:
- pgstore:/var/lib/postgresql/data
- ./init.sql:/docker-entrypoint-initdb.d/create_database.sql
- ./src/sql/init.sql:/docker-entrypoint-initdb.d/create_database.sql
server:
container_name: server-1
image: node:18
restart: always
env_file: .env.docker
command: ["node", "./src/server.js"]
build:
context: .
dockerfile: Dockerfile
Expand All @@ -38,6 +38,5 @@ services:
depends_on:
db:
condition: service_healthy
restart: true
expose:
- 3000
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
roots: ["dist/tests/"],
roots: ["<rootDir>/dist"],
}