From 6e731218341e3f65098398931e59d203ec92897e Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 9 Feb 2025 11:44:50 +0300 Subject: [PATCH 1/2] get rid of docker junk --- .dockerignore | 5 ----- Dockerfile | 10 ---------- docker-compose.yml | 23 ----------------------- 3 files changed, 38 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index b8aefbd..0000000 --- a/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules/ -LICENSE -README.md -package-lock.json -yarn.lock diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7640399..0000000 --- a/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node:17 - -# Set working directory -WORKDIR /opt/catApi -# and copy files into that directory -COPY . ./ - -RUN npm install -g npm@8 && npm install --save-dev - -CMD npm start diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index bdf6df5..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -## DO NOT USE ## -services: - catweb: - build: . - ports: - - "${PORT}:${PORT}" - command: npm start - container_name: catApi - restart: unless-stopped - volumes: - - type: bind - source: ./images - target: /opt/catApi/images - - type: bind - source: ./.env - target: /opt/catApi/.env - tmpfs: /tmp # temp files such are stored here - working_dir: /opt/catApi - tty: true - environment: - - NODE_ENV=production # for production - - LOG_LEVEL=debug # debug, info, warn, error - - FORCE_COLOR=3 # force color output From f4ad0b5640b1ad3a920609eb500b9a8d9b832207 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 9 Feb 2025 11:45:04 +0300 Subject: [PATCH 2/2] ci: update go version --- .github/workflows/go.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 9ca911d..21273ee 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,29 +2,28 @@ name: Go on: push: - branches: [ "v2" ] + branches: ["v2"] pull_request: - branches: [ "v2" ] + branches: ["v2"] jobs: - build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.20' + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: "1.23" - - name: Build - run: go build -v ./. + - name: Build + run: go build -v ./.. - - name: Upload a Build Artifact - uses: actions/upload-artifact@v3.1.3 - with: - # Artifact name - name: "catApi" - # A file, directory or wildcard pattern that describes what to upload - path: "catApi" + - name: Upload a Build Artifact + uses: actions/upload-artifact@v3.1.3 + with: + # Artifact name + name: "catApi" + # A file, directory or wildcard pattern that describes what to upload + path: "catApi"