From 27b48dabfc4395fa26adc2aaf0b3c2171b926989 Mon Sep 17 00:00:00 2001 From: ablogo Date: Sun, 21 Dec 2025 23:55:41 -0500 Subject: [PATCH 1/3] Create action docker-image.yml --- .github/workflows/docker-image.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..451ac43 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,16 @@ +name: Docker Image CI + +on: + pull_request: + branches: [ "main" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag auth-service:$(date +%s) From 74472acfb7ebed56f5c531beb21ae7ccb8be08db Mon Sep 17 00:00:00 2001 From: ablogo Date: Mon, 22 Dec 2025 10:54:52 -0600 Subject: [PATCH 2/3] improve docker action --- .github/workflows/docker-image.yml | 39 ++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 451ac43..2855ee8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,16 +1,41 @@ -name: Docker Image CI +name: Create and publish Docker image CI on: pull_request: branches: [ "main" ] +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: + push_to_register: + name: Push Docker image to github register + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + steps: + - name: Check out the repo + uses: actions/checkout@v5 - build: + - name: Log in to the container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GH_TOKEN }} - runs-on: ubuntu-latest + - name: Extract metadata (tags, labels) + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag auth-service:$(date +%s) + - name: Build and push Docker image + id: push + uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 55eb93e59b219a3be2fa1c89a5fd45a6f55caed3 Mon Sep 17 00:00:00 2001 From: ablogo Date: Mon, 22 Dec 2025 11:04:49 -0600 Subject: [PATCH 3/3] add config files to githubignore and fix docker action --- .env | 5 +++-- .github/workflows/docker-image.yml | 3 ++- .gitignore | 3 ++- config.ini | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.env b/.env index e2d56b7..19d794b 100644 --- a/.env +++ b/.env @@ -2,8 +2,9 @@ MONGO_URL = DB_NAME = development DB_USERS_COLLECTION = "users" DB_USERS_PICTURES_COLLECTION = "users.pictures" -DB_USERS_ADDRESS_COLLECTION = "users.addresses" -SECRET_KEY = +DB_USERS_CONTACTS_COLLECTION = "users.contacts" +DB_USERS_MESSAGES_COLLECTION = "users.messages" +SECRET_KEY = "" ALGORITHM = "HS256" EXPIRE_MINUTES = 15 CORS_ALLOWED_HOSTS = "http://localhost:8081" \ No newline at end of file diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2855ee8..adb73aa 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,7 +29,8 @@ jobs: - name: Extract metadata (tags, labels) id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image id: push diff --git a/.gitignore b/.gitignore index 690f310..523b8d5 100755 --- a/.gitignore +++ b/.gitignore @@ -16,10 +16,11 @@ *.pem #Environment -#.env +.env .venv env/ venv/ +*.ini #Docker #*Dockerfile diff --git a/config.ini b/config.ini index 14494e4..bb9ac36 100644 --- a/config.ini +++ b/config.ini @@ -4,7 +4,7 @@ name=development [log] db_url= -db_database=logs +db_database=auth-logs db_collection= level=DEBUG