From f8ae4a2665ec2b3cd87185585ae7e66087c6af75 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 31 Oct 2025 18:04:46 +0100 Subject: [PATCH 01/53] add ci status check --- .gitea/workflows/checks-and-policy.yml | 185 +++++++++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 .gitea/workflows/checks-and-policy.yml diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml new file mode 100644 index 0000000..e2e1d80 --- /dev/null +++ b/.gitea/workflows/checks-and-policy.yml @@ -0,0 +1,185 @@ +name: checks + +on: + push: + pull_request: + +jobs: + frontend-jobs: + name: Set up Node and other necessary dependencies for Frontend Tests and Build + runs-on: ubuntu-latest + + steps: + - name: Info + run: | + echo "Triggered by ${{ gitea.event_name }} event" + echo "Branch: ${{ gitea.ref }}" + echo "Repository: ${{ gitea.repository }}" + + - name: Install Node.js, npm, and Yarn (optimized) + run: | + set -e + echo "Preparing Node.js, npm, and Yarn setup..." + + if command -v apt >/dev/null 2>&1; then + echo "→ Using apt (Debian/Ubuntu)..." + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq >/dev/null + apt-get install -y -qq curl ca-certificates >/dev/null + curl -fsSL https://deb.nodesource.com/setup_20.x | bash - >/dev/null 2>&1 + apt-get install -y -qq nodejs >/dev/null + npm install -g yarn --silent + + elif command -v apk >/dev/null 2>&1; then + echo "→ Using apk (Alpine)..." + apk add --no-cache curl nodejs npm >/dev/null + npm install -g yarn --silent + + elif command -v dnf >/dev/null 2>&1; then + echo "→ Using dnf (Fedora/RHEL)..." + dnf install -y -q curl ca-certificates nodejs npm >/dev/null + npm install -g yarn --silent + + else + echo "No supported package manager found (apt, apk, dnf)." + exit 1 + fi + + echo "Node.js, npm, and Yarn installed successfully:" + node -v + npm -v + yarn -v + + - name: Checkout repository manually + env: + TOKEN: ${{ secrets.ACCESS_TOKEN }} + CLONE_URL: ${{ vars.CLONE_URL }} + run: | + echo "Cloning from $CLONE_URL" + echo "Cloning ALL_REPO_TOKEN $ALL_REPO_TOKEN" + CLONE_URL_WITH_AUTH=$(echo "$CLONE_URL" | sed "s#https://#https://$ALL_REPO_TOKEN@#") + git clone --quiet "$CLONE_URL_WITH_AUTH" . + echo "${{ gitea.repository }} cloned successfully." + + # Install frontend dependencies and run tests + - name: Install frontend dependencies and run tests + #uses: actions/cache@v3 + working-directory: ./frontend + with: + path: | + ~/.yarn/cache + ./node_modules + key: frontend-${{ runner.os }}-yarn-${{ hashFiles('frontend/yarn.lock') }} + restore-keys: | + frontend-${{ runner.os }}-yarn- + run: | + yarn install --frozen-lockfile + #yarn test --watchAll=false --ci + + #Check frontend linting + - name: Check frontend linting + working-directory: ./frontend + run: yarn lint + + - name: Set frontend status + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.ACCESS_TOKEN }} + script: | + github.repos.createCommitStatus({ + owner: context.repo.owner, + repo: context.repo.repo, + sha: context.sha, + state: 'success', + context: 'CI Frontend', + description: 'Frontend unit tests passed' + }) + + backend-jobs: + name: Set up Java for Backend Tests and Build + runs-on: ubuntu-latest + #container: + #image: eclipse-temurin:21-jdk + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Java 21 + Maven + run: | + echo "Detecting package manager..." + if command -v apt-get >/dev/null 2>&1; then + PM=apt + elif command -v apk >/dev/null 2>&1; then + PM=apk + elif command -v yum >/dev/null 2>&1; then + PM=yum + else + echo "No known package manager found. Will install JDK manually." + PM=none + fi + + echo "Package manager detected: $PM" + + if [ "$PM" = "apt" ]; then + apt-get update -y + apt-get install -y openjdk-21-jdk maven wget tar + JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64 + elif [ "$PM" = "apk" ]; then + apk update + apk add openjdk21 maven wget tar + JAVA_HOME=/usr/lib/jvm/java-21-openjdk + elif [ "$PM" = "yum" ]; then + yum install -y java-21-openjdk-devel maven wget tar + JAVA_HOME=/usr/lib/jvm/java-21-openjdk + else + # Fallback: manual download + JDK_URL="https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz" + mkdir -p /opt/jdk + wget -q -O /tmp/jdk.tar.gz $JDK_URL + tar -xzf /tmp/jdk.tar.gz -C /opt/jdk --strip-components=1 + JAVA_HOME=/opt/jdk + fi + + # Export JAVA_HOME and update PATH for subsequent steps + echo "JAVA_HOME=$JAVA_HOME" >> $GITEA_ENV + echo "$JAVA_HOME/bin" >> $GITEA_PATH + export JAVA_HOME=$JAVA_HOME + export PATH=$JAVA_HOME/bin:$PATH + + # Verify Java and Maven installation + java -version + mvn -version + + - name: Verify Java setup + run: | + java -version + + - name: Verify Java setup + run: | + ls -l $JAVA_HOME/bin/java + file $JAVA_HOME/bin/java || true + java -version + + # Run backend tests and build + - name: Test & build backend + working-directory: . + run: + mvn clean test -Dspring.profiles.active=test + + - name: Set backend status + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.ACCESS_TOKEN }} + script: | + github.repos.createCommitStatus({ + owner: context.repo.owner, + repo: context.repo.repo, + sha: context.sha, + state: 'success', + context: 'CI Backend', + description: 'Backend unit tests passed' + }) + + - name: Done + run: echo "Workflow successfully completed." \ No newline at end of file -- 2.49.0 From 217e47ed2091c2fe9021f12604c08a241cabca4a Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 31 Oct 2025 18:25:17 +0100 Subject: [PATCH 02/53] del --- .gitea/workflows/checks-and-policy.yml | 28 -------------------------- 1 file changed, 28 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index e2e1d80..8fc17ec 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -81,20 +81,6 @@ jobs: working-directory: ./frontend run: yarn lint - - name: Set frontend status - uses: actions/github-script@v7 - with: - github-token: ${{ secrets.ACCESS_TOKEN }} - script: | - github.repos.createCommitStatus({ - owner: context.repo.owner, - repo: context.repo.repo, - sha: context.sha, - state: 'success', - context: 'CI Frontend', - description: 'Frontend unit tests passed' - }) - backend-jobs: name: Set up Java for Backend Tests and Build runs-on: ubuntu-latest @@ -167,19 +153,5 @@ jobs: run: mvn clean test -Dspring.profiles.active=test - - name: Set backend status - uses: actions/github-script@v7 - with: - github-token: ${{ secrets.ACCESS_TOKEN }} - script: | - github.repos.createCommitStatus({ - owner: context.repo.owner, - repo: context.repo.repo, - sha: context.sha, - state: 'success', - context: 'CI Backend', - description: 'Backend unit tests passed' - }) - - name: Done run: echo "Workflow successfully completed." \ No newline at end of file -- 2.49.0 From 0fae75c2bfb00cf5138db3cc1539e162b0f77dcb Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 31 Oct 2025 18:26:27 +0100 Subject: [PATCH 03/53] del --- .../ebrains/cruddemo/serviceimpl/StudentServiceImplTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/ebrains/cruddemo/serviceimpl/StudentServiceImplTest.java b/src/test/java/com/ebrains/cruddemo/serviceimpl/StudentServiceImplTest.java index d3cff93..ccaaf15 100644 --- a/src/test/java/com/ebrains/cruddemo/serviceimpl/StudentServiceImplTest.java +++ b/src/test/java/com/ebrains/cruddemo/serviceimpl/StudentServiceImplTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -@ActiveProfiles("test") // ensures application-test.properties is used +@ActiveProfiles("test") public class StudentServiceImplTest { private final StudentRepository studentRepository = mock(StudentRepository.class); -- 2.49.0 From 0fd1c9e922d8f96347e517529e8b92b0a6db9fa2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 14:41:59 +0100 Subject: [PATCH 04/53] add docker file and build script --- .gitea/workflows/checks-and-policy.yml | 1 + Dockerfile | 47 ++++++++++++++++++++++++++ build-image.sh | 8 +++++ 3 files changed, 56 insertions(+) create mode 100644 Dockerfile create mode 100644 build-image.sh diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 8fc17ec..409b5e4 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -74,6 +74,7 @@ jobs: frontend-${{ runner.os }}-yarn- run: | yarn install --frozen-lockfile + yarn build #yarn test --watchAll=false --ci #Check frontend linting diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6e9a367 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,47 @@ +# ===== Stage 1: Build with Maven ===== +FROM eclipse-temurin:21-jdk-alpine AS builder + +ARG MAVEN_VERSION=3.9.9 +ENV MAVEN_HOME=/opt/maven +ENV PATH=${MAVEN_HOME}/bin:${PATH} + +# Install required tools quietly and set up Maven +RUN set -eux; \ + apk add --no-cache curl tar bash openssl >/dev/null; \ + echo "Downloading Maven ${MAVEN_VERSION}..."; \ + curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o /tmp/maven.tar.gz; \ + mkdir -p /opt >/dev/null; \ + tar -xzf /tmp/maven.tar.gz -C /opt >/dev/null; \ + ln -s /opt/apache-maven-${MAVEN_VERSION} ${MAVEN_HOME}; \ + rm /tmp/maven.tar.gz; \ + echo "✅ Maven ${MAVEN_VERSION} installed successfully." + +WORKDIR /build + +# Copy pom.xml and prefetch dependencies silently +COPY pom.xml . +RUN mvn -B -q dependency:go-offline + +# Copy source code +COPY src ./src + +# Build project (skip tests, quiet mode) +RUN mvn -B -q clean package -DskipTests + +# ===== Stage 2: Runtime image ===== +FROM eclipse-temurin:21-jre-alpine + +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring + +WORKDIR /app + +COPY --from=builder /build/target/*.jar app.jar + +EXPOSE 8080 + +# Optional: Health check (Spring Boot actuator) +HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \ + CMD wget -qO- http://localhost:8080/actuator/health | grep '"status":"UP"' || exit 1 + +ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "app.jar"] \ No newline at end of file diff --git a/build-image.sh b/build-image.sh new file mode 100644 index 0000000..9fb4fea --- /dev/null +++ b/build-image.sh @@ -0,0 +1,8 @@ +#! /bin/bash +set -e # Exit immediately if a command exits with a non-zero status + +export $(grep -v '^#' C:/atrizult/projects/.env | xargs) + +#Build +docker buildx build --no-cache -t eberen/services:backend-${VERSION} . +echo "Docker Image Built Successfully" -- 2.49.0 From 7ac437e714c6797508752e08590401056b3ffa03 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 14:49:11 +0100 Subject: [PATCH 05/53] update job name --- .gitea/workflows/checks-and-policy.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 409b5e4..25dbd50 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -61,8 +61,13 @@ jobs: git clone --quiet "$CLONE_URL_WITH_AUTH" . echo "${{ gitea.repository }} cloned successfully." + #Check frontend linting + - name: Check frontend linting + working-directory: ./frontend + run: yarn lint + # Install frontend dependencies and run tests - - name: Install frontend dependencies and run tests + - name: Install dependencies, run tests and build frontend #uses: actions/cache@v3 working-directory: ./frontend with: @@ -77,16 +82,9 @@ jobs: yarn build #yarn test --watchAll=false --ci - #Check frontend linting - - name: Check frontend linting - working-directory: ./frontend - run: yarn lint - backend-jobs: name: Set up Java for Backend Tests and Build runs-on: ubuntu-latest - #container: - #image: eclipse-temurin:21-jdk steps: - name: Checkout repository @@ -153,6 +151,4 @@ jobs: working-directory: . run: mvn clean test -Dspring.profiles.active=test - - - name: Done - run: echo "Workflow successfully completed." \ No newline at end of file + echo "Backend test and build workflow successfully completed." -- 2.49.0 From 814550903adc2e1ed69b79307e6c36cfefe0b35a Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 14:52:04 +0100 Subject: [PATCH 06/53] delete lint job --- .gitea/workflows/checks-and-policy.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 25dbd50..a5a09a1 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -61,11 +61,6 @@ jobs: git clone --quiet "$CLONE_URL_WITH_AUTH" . echo "${{ gitea.repository }} cloned successfully." - #Check frontend linting - - name: Check frontend linting - working-directory: ./frontend - run: yarn lint - # Install frontend dependencies and run tests - name: Install dependencies, run tests and build frontend #uses: actions/cache@v3 @@ -79,6 +74,7 @@ jobs: frontend-${{ runner.os }}-yarn- run: | yarn install --frozen-lockfile + yarn lint yarn build #yarn test --watchAll=false --ci @@ -151,4 +147,4 @@ jobs: working-directory: . run: mvn clean test -Dspring.profiles.active=test - echo "Backend test and build workflow successfully completed." + echo "Backend test and build workflow successfully completed." \ No newline at end of file -- 2.49.0 From fb93faad5c8efc54b4642073cdad69d7bcb9841f Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 14:56:17 +0100 Subject: [PATCH 07/53] echo test and build completion --- .gitea/workflows/checks-and-policy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index a5a09a1..c58c9cd 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -145,6 +145,6 @@ jobs: # Run backend tests and build - name: Test & build backend working-directory: . - run: + run: | mvn clean test -Dspring.profiles.active=test echo "Backend test and build workflow successfully completed." \ No newline at end of file -- 2.49.0 From b2f4b47e0596a691f8af84fdcb038dadede46744 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 16:13:43 +0100 Subject: [PATCH 08/53] add publish frontend --- .gitea/workflows/checks-and-policy.yml | 57 ++++++++++++++++++++++++++ .gitea/workflows/demo.yaml | 37 ++++++++++++++++- frontend/public/.htaccess | 8 ++++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 frontend/public/.htaccess diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index c58c9cd..c7228d5 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -78,6 +78,63 @@ jobs: yarn build #yarn test --watchAll=false --ci + # Ensure SSH and SCP are installed and functional + - name: Setup SSH and SCP + run: | + set -e + echo "Ensuring SSH and SCP are available..." + if command -v apt >/dev/null 2>&1; then + apt-get update -qq >/dev/null + apt-get install -y -qq openssh-client >/dev/null + elif command -v apk >/dev/null 2>&1; then + apk add --no-cache openssh >/dev/null + elif command -v dnf >/dev/null 2>&1; then + dnf install -y -q openssh-clients >/dev/null + else + echo "No supported package manager found for SSH installation." + exit 1 + fi + echo "SSH and SCP successfully installed:" + ssh -V + scp -V || echo "SCP version info not available but command exists." + + - name: Publish frontend .next build to server + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SERVER_IP: ${{ vars.SERVER_IP }} + run: | + mkdir -p ~/.ssh + echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + echo "vars.SERVER_IP: $vars.SERVER_IP" + echo "vars.DOMAIN_NAME: $vars.DOMAIN_NAME" + chmod 600 ~/.ssh/id_rsa + ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p /var/www/frontend" + scp -o StrictHostKeyChecking=no -r frontend/.next root@$SERVER_IP:/var/www/frontend/ + echo "Frontend artifact copied successfully to $SERVER_IP:/var/www/frontend" + + - name: Publish frontend .next build to Plesk server + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SERVER_IP: ${{ vars.SERVER_IP }} + DOMAIN_NAME: ${{ vars.DOMAIN_NAME }} # optional, helps locate vhost + run: | + mkdir -p ~/.ssh + echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + echo "Deploying to server: $SERVER_IP" + + #Define Plesk web root (update DOMAIN_NAME in Gitea variables) + WEB_ROOT="/var/www/vhosts/${DOMAIN_NAME}/httpdocs" + + ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p $WEB_ROOT/.next" + ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p $WEB_ROOT/public/.htaccess" + + #Copy only the .next build folder to the server + scp -o StrictHostKeyChecking=no -r frontend/.next root@$SERVER_IP:$WEB_ROOT/ + + echo "Frontend .next build successfully deployed to $SERVER_IP:$WEB_ROOT/.next" + backend-jobs: name: Set up Java for Backend Tests and Build runs-on: ubuntu-latest diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml index d3f1e27..9e89a8e 100644 --- a/.gitea/workflows/demo.yaml +++ b/.gitea/workflows/demo.yaml @@ -72,4 +72,39 @@ jobs: yarn -v - name: Done - run: echo "Workflow finished." \ No newline at end of file + run: echo "Workflow finished." + + #blish-backend-docker-image: + #name: Build and publish backend Docker image to server + #runs-on: ubuntu-latest + #needs: backend-jobs + #steps: + # - name: Checkout repository + # uses: actions/checkout@v4 + # + # - name: Set up Docker + # run: | + # apt-get update -y + # apt-get install -y docker.io + # + # - name: Build Docker image + # run: | + # docker build -t backend-app:latest . + # + # - name: Save Docker image as tarball + # run: docker save backend-app:latest -o backend-app.tar + # + # - name: Copy Docker image to remote server and load it + # env: + # SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + # SERVER_IP: + # run: | + # mkdir -p ~/.ssh + # echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + # chmod 600 ~/.ssh/id_rsa + # scp -o StrictHostKeyChecking=no backend-app.tar root@$SERVER_IP:/tmp/backend-app.tar + # ssh -o StrictHostKeyChecking=no root@$SERVER_IP " + # docker load -i /tmp/backend-app.tar && + # docker tag backend-app:latest backend-app:latest && + # echo 'Backend Docker image loaded successfully' + # " diff --git a/frontend/public/.htaccess b/frontend/public/.htaccess new file mode 100644 index 0000000..3d5d80c --- /dev/null +++ b/frontend/public/.htaccess @@ -0,0 +1,8 @@ + + RewriteEngine On + RewriteBase / + RewriteRule ^index\.html$ - [L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.html [L] + \ No newline at end of file -- 2.49.0 From 9543e5fb6924c27d1ba3487c8f339445c6228c00 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 19:35:33 +0100 Subject: [PATCH 09/53] convert --- .gitea/workflows/checks-and-policy.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index c7228d5..ea817ce 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -105,9 +105,25 @@ jobs: run: | mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + echo "vars.SERVER_IP: $vars.SERVER_IP" echo "vars.DOMAIN_NAME: $vars.DOMAIN_NAME" + + cat ~/.ssh/id_rsa | head -3 + + # Convert if it's a PEM key + if grep -q "BEGIN PRIVATE KEY" ~/.ssh/id_rsa; then + echo "Converting PKCS#8 key to OpenSSH-compatible RSA key..." + openssl rsa -in ~/.ssh/id_rsa -out ~/.ssh/id_rsa.openssh >/dev/null 2>&1 + mv ~/.ssh/id_rsa.openssh ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa + fi + + echo "SSH key ready for use:" + ssh-keygen -lf ~/.ssh/id_rsa + ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p /var/www/frontend" scp -o StrictHostKeyChecking=no -r frontend/.next root@$SERVER_IP:/var/www/frontend/ echo "Frontend artifact copied successfully to $SERVER_IP:/var/www/frontend" -- 2.49.0 From 4388e2a85faf6ab8bea259a829b48803dfc94770 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 19:40:28 +0100 Subject: [PATCH 10/53] convert --- .gitea/workflows/checks-and-policy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index ea817ce..970a7c2 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -102,14 +102,14 @@ jobs: env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} SERVER_IP: ${{ vars.SERVER_IP }} + DOMAIN_NAME: ${{ vars.$DOMAIN_NAME }} run: | mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - - echo "vars.SERVER_IP: $vars.SERVER_IP" - echo "vars.DOMAIN_NAME: $vars.DOMAIN_NAME" + echo "SERVER_IP: $SERVER_IP" + echo "DOMAIN_NAME: $DOMAIN_NAME" cat ~/.ssh/id_rsa | head -3 -- 2.49.0 From 1dec8c86513c14420c485c971ba339ce39a3d4d5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 19:48:29 +0100 Subject: [PATCH 11/53] convert --- .gitea/workflows/checks-and-policy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 970a7c2..3480814 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -100,16 +100,16 @@ jobs: - name: Publish frontend .next build to server env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} SERVER_IP: ${{ vars.SERVER_IP }} DOMAIN_NAME: ${{ vars.$DOMAIN_NAME }} run: | mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + echo "$SSH_PUBLIC_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - echo "SERVER_IP: $SERVER_IP" - echo "DOMAIN_NAME: $DOMAIN_NAME" + echo "SERVER_IP: $SERVER_IP" + echo "DOMAIN_NAME: $DOMAIN_NAME" cat ~/.ssh/id_rsa | head -3 -- 2.49.0 From ff6c9b19271b00d5bd592b27d77ee33cb80c8406 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 19:50:33 +0100 Subject: [PATCH 12/53] fix domain name --- .gitea/workflows/checks-and-policy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 3480814..914d3b3 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -102,7 +102,7 @@ jobs: env: SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} SERVER_IP: ${{ vars.SERVER_IP }} - DOMAIN_NAME: ${{ vars.$DOMAIN_NAME }} + DOMAIN_NAME: ${{ vars.DOMAIN_NAME }} run: | mkdir -p ~/.ssh echo "$SSH_PUBLIC_KEY" > ~/.ssh/id_rsa -- 2.49.0 From 08c6f33ef49979ed7fcf3a7e88fd3b6a81182e24 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 19:54:19 +0100 Subject: [PATCH 13/53] fix domain name --- .gitea/workflows/checks-and-policy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 914d3b3..09a0e58 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -100,7 +100,8 @@ jobs: - name: Publish frontend .next build to server env: - SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + #SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + SSH_PUBLIC_KEY: ${{ vars.SSH_PUBLIC_KEY }} SERVER_IP: ${{ vars.SERVER_IP }} DOMAIN_NAME: ${{ vars.DOMAIN_NAME }} run: | -- 2.49.0 From e5eb0d74cca46a6add0053e5776feb2476a3537e Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 2 Nov 2025 20:03:05 +0100 Subject: [PATCH 14/53] prv key --- .gitea/workflows/checks-and-policy.yml | 38 ++++++++------------------ 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index 09a0e58..dad54f9 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -98,19 +98,22 @@ jobs: ssh -V scp -V || echo "SCP version info not available but command exists." - - name: Publish frontend .next build to server + - name: Publish frontend .next build to Plesk server env: - #SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} - SSH_PUBLIC_KEY: ${{ vars.SSH_PUBLIC_KEY }} + SSH_PRIVATE_KEY: ${{ vars.SSH_PRIVATE_KEY }} SERVER_IP: ${{ vars.SERVER_IP }} - DOMAIN_NAME: ${{ vars.DOMAIN_NAME }} + DOMAIN_NAME: ${{ vars.DOMAIN_NAME }} # optional, helps locate vhost run: | mkdir -p ~/.ssh - echo "$SSH_PUBLIC_KEY" > ~/.ssh/id_rsa + echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - - echo "SERVER_IP: $SERVER_IP" - echo "DOMAIN_NAME: $DOMAIN_NAME" + + echo "Deploying to server: $SERVER_IP" + echo "Deploying to domain: $DOMAIN_NAME" + echo "Deploying with private key: $SSH_PRIVATE_KEY" + + #Define Plesk web root (update DOMAIN_NAME in Gitea variables) + WEB_ROOT="/var/www/vhosts/${DOMAIN_NAME}/httpdocs" cat ~/.ssh/id_rsa | head -3 @@ -124,25 +127,6 @@ jobs: echo "SSH key ready for use:" ssh-keygen -lf ~/.ssh/id_rsa - - ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p /var/www/frontend" - scp -o StrictHostKeyChecking=no -r frontend/.next root@$SERVER_IP:/var/www/frontend/ - echo "Frontend artifact copied successfully to $SERVER_IP:/var/www/frontend" - - - name: Publish frontend .next build to Plesk server - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SERVER_IP: ${{ vars.SERVER_IP }} - DOMAIN_NAME: ${{ vars.DOMAIN_NAME }} # optional, helps locate vhost - run: | - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - echo "Deploying to server: $SERVER_IP" - - #Define Plesk web root (update DOMAIN_NAME in Gitea variables) - WEB_ROOT="/var/www/vhosts/${DOMAIN_NAME}/httpdocs" ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p $WEB_ROOT/.next" ssh -o StrictHostKeyChecking=no root@$SERVER_IP "mkdir -p $WEB_ROOT/public/.htaccess" -- 2.49.0 From 188ab830069ef66e163fb4dfb4b97ca60256838b Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 20:23:18 +0100 Subject: [PATCH 15/53] full latest --- .gitea/workflows/checks-and-policy.yml | 1 - .gitea/workflows/full-latest.yaml | 43 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/full-latest.yaml diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index dad54f9..cedb3bd 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -110,7 +110,6 @@ jobs: echo "Deploying to server: $SERVER_IP" echo "Deploying to domain: $DOMAIN_NAME" - echo "Deploying with private key: $SSH_PRIVATE_KEY" #Define Plesk web root (update DOMAIN_NAME in Gitea variables) WEB_ROOT="/var/www/vhosts/${DOMAIN_NAME}/httpdocs" diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml new file mode 100644 index 0000000..594794c --- /dev/null +++ b/.gitea/workflows/full-latest.yaml @@ -0,0 +1,43 @@ +name: Gitea Actions Demo +run-name: ${{ gitea.actor }} is testing out Gitea Actions + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + Builder: + runs-on: catthehacker-ubuntu-latest + steps: + - name: Info + run: | + echo "Triggered by ${{ gitea.event_name }} event" + echo "Branch: ${{ gitea.ref }}" + echo "Repository: ${{ gitea.repository }}" + + - name: Update apt-get + run: | + apt-get update -y + #apt-get update -qq >/dev/null -y + + - name: Clone the repository + uses: actions/checkout@v4 + #with: + #repository: ${{ gitea.repository }} + #token: ${{ secrets.ACCESS_TOKEN }} + #fetch-depth: 0 + + #- name: Checkout repository manually + # env: + # TOKEN: ${{ secrets.ACCESS_TOKEN }} + # CLONE_URL: ${{ vars.CLONE_URL }} + # run: | + # echo "Cloning from $CLONE_URL" + # echo "Cloning ALL_REPO_TOKEN $ALL_REPO_TOKEN" + # CLONE_URL_WITH_AUTH=$(echo "$CLONE_URL" | sed "s#https://#https://$ALL_REPO_TOKEN@#") + # git clone --quiet "$CLONE_URL_WITH_AUTH" . + # echo "${{ gitea.repository }} cloned successfully." \ No newline at end of file -- 2.49.0 From c01ffd48e1189fb3e7249bfe84cd8b8efb6e4c7b Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 20:25:30 +0100 Subject: [PATCH 16/53] full latest --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 594794c..83d992a 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -11,7 +11,7 @@ on: jobs: Builder: - runs-on: catthehacker-ubuntu-latest + runs-on: catthacker-ubuntu-latest steps: - name: Info run: | -- 2.49.0 From b78e710f8672dc00a9e9145cdd5e49420a71078b Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 20:32:04 +0100 Subject: [PATCH 17/53] full latest 2 --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 83d992a..57862c5 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -1,4 +1,4 @@ -name: Gitea Actions Demo +name: Gitea Actions Demo 2 run-name: ${{ gitea.actor }} is testing out Gitea Actions on: -- 2.49.0 From 4c35b3802f5ab4e1bec3be21a7933df9ebe973a1 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 20:53:51 +0100 Subject: [PATCH 18/53] skip and build mvn --- .gitea/workflows/checks-and-policy.yml | 2 ++ .gitea/workflows/demo.yaml | 2 ++ .gitea/workflows/full-latest.yaml | 23 ++++++++++++----------- .gitea/workflows/test.yml | 2 ++ 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/checks-and-policy.yml b/.gitea/workflows/checks-and-policy.yml index cedb3bd..ee6c400 100644 --- a/.gitea/workflows/checks-and-policy.yml +++ b/.gitea/workflows/checks-and-policy.yml @@ -7,6 +7,7 @@ on: jobs: frontend-jobs: name: Set up Node and other necessary dependencies for Frontend Tests and Build + if: ${{ github.ref == 'refs/heads/main' }} # skip runs-on: ubuntu-latest steps: @@ -137,6 +138,7 @@ jobs: backend-jobs: name: Set up Java for Backend Tests and Build + if: ${{ github.ref == 'refs/heads/main' }} # skip runs-on: ubuntu-latest steps: diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml index 9e89a8e..27082ef 100644 --- a/.gitea/workflows/demo.yaml +++ b/.gitea/workflows/demo.yaml @@ -11,6 +11,8 @@ on: jobs: Explore-Gitea-Actions-2: + name: "Explore Gitea Actions - 2" + if: ${{ github.ref == 'refs/heads/main' }} # skip runs-on: ubuntu-latest steps: - name: Info diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 57862c5..5e58d26 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -22,7 +22,6 @@ jobs: - name: Update apt-get run: | apt-get update -y - #apt-get update -qq >/dev/null -y - name: Clone the repository uses: actions/checkout@v4 @@ -31,13 +30,15 @@ jobs: #token: ${{ secrets.ACCESS_TOKEN }} #fetch-depth: 0 - #- name: Checkout repository manually - # env: - # TOKEN: ${{ secrets.ACCESS_TOKEN }} - # CLONE_URL: ${{ vars.CLONE_URL }} - # run: | - # echo "Cloning from $CLONE_URL" - # echo "Cloning ALL_REPO_TOKEN $ALL_REPO_TOKEN" - # CLONE_URL_WITH_AUTH=$(echo "$CLONE_URL" | sed "s#https://#https://$ALL_REPO_TOKEN@#") - # git clone --quiet "$CLONE_URL_WITH_AUTH" . - # echo "${{ gitea.repository }} cloned successfully." \ No newline at end of file + - name: Build with Maven + #uses: actions/checkout@v5 + #uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + #cache-dependency-path: 'sub-project/pom.xml' # optional + run: | + java -version + mvn -version + mvn clean test -Dspring.profiles.active=test \ No newline at end of file diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 8fc17ec..d481e1e 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -7,6 +7,7 @@ on: jobs: frontend-jobs: name: Set up Node and other necessary dependencies for Frontend Tests and Build + if: ${{ github.ref == 'refs/heads/main' }} # skip runs-on: ubuntu-latest steps: @@ -83,6 +84,7 @@ jobs: backend-jobs: name: Set up Java for Backend Tests and Build + if: ${{ github.ref == 'refs/heads/main' }} # skip runs-on: ubuntu-latest #container: #image: eclipse-temurin:21-jdk -- 2.49.0 From 89bdea01097a32e64dfaf6b0288c61bd1c8c7617 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 20:59:07 +0100 Subject: [PATCH 19/53] setup java --- .gitea/workflows/full-latest.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 5e58d26..4c414c0 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -30,13 +30,20 @@ jobs: #token: ${{ secrets.ACCESS_TOKEN }} #fetch-depth: 0 - - name: Build with Maven - #uses: actions/checkout@v5 - #uses: actions/setup-java@v5 + - name: Set up Java + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' cache: 'maven' + + - name: Build with Maven + #uses: actions/checkout@v5 + #uses: actions/setup-java@v5 + #with: + #distribution: 'temurin' + #java-version: '21' + #cache: 'maven' #cache-dependency-path: 'sub-project/pom.xml' # optional run: | java -version -- 2.49.0 From 572299cb21e9fbb121c763b5f64786f471f0b664 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 21:02:36 +0100 Subject: [PATCH 20/53] install mvn --- .gitea/workflows/full-latest.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 4c414c0..46a6244 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -19,9 +19,10 @@ jobs: echo "Branch: ${{ gitea.ref }}" echo "Repository: ${{ gitea.repository }}" - - name: Update apt-get + - name: Update apt-get and install Maven run: | apt-get update -y + apt-get install -y maven - name: Clone the repository uses: actions/checkout@v4 -- 2.49.0 From 3de18321e75bf2352fc8a358f541e10a539541c2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 21:06:11 +0100 Subject: [PATCH 21/53] install mvn with few logs --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 46a6244..9a0827c 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -49,4 +49,4 @@ jobs: run: | java -version mvn -version - mvn clean test -Dspring.profiles.active=test \ No newline at end of file + mvn -B -q clean test -Dspring.profiles.active=test \ No newline at end of file -- 2.49.0 From a92b1267d82387aae48dbe8f48a76fad4eb2bbac Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 21:08:12 +0100 Subject: [PATCH 22/53] ubuntu latest and logs --- .gitea/workflows/full-latest.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 9a0827c..38b8778 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -11,7 +11,7 @@ on: jobs: Builder: - runs-on: catthacker-ubuntu-latest + runs-on: ubuntu-latest steps: - name: Info run: | @@ -39,13 +39,6 @@ jobs: cache: 'maven' - name: Build with Maven - #uses: actions/checkout@v5 - #uses: actions/setup-java@v5 - #with: - #distribution: 'temurin' - #java-version: '21' - #cache: 'maven' - #cache-dependency-path: 'sub-project/pom.xml' # optional run: | java -version mvn -version -- 2.49.0 From 82fc878c4d7968fc1eed7c21a5b2ba84faffb3a3 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 21:12:03 +0100 Subject: [PATCH 23/53] catthacker --- .gitea/workflows/full-latest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 38b8778..b46d1dd 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -11,7 +11,7 @@ on: jobs: Builder: - runs-on: ubuntu-latest + runs-on: catthacker-ubuntu-latest steps: - name: Info run: | @@ -42,4 +42,4 @@ jobs: run: | java -version mvn -version - mvn -B -q clean test -Dspring.profiles.active=test \ No newline at end of file + mvn -B clean test -Dspring.profiles.active=test \ No newline at end of file -- 2.49.0 From e9a8e9d6820d6edf123c54e40a90bfe68cd5dd74 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 22:05:00 +0100 Subject: [PATCH 24/53] build app images --- .gitea/workflows/full-latest.yaml | 34 ++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index b46d1dd..d0b147f 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -42,4 +42,36 @@ jobs: run: | java -version mvn -version - mvn -B clean test -Dspring.profiles.active=test \ No newline at end of file + mvn -B clean test -Dspring.profiles.active=test + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + #Build Docker image + - name: Build Docker image + env: + GITEA_REGISTRY_URL: 'git.bepastem.com' + OWNER: ${{ gitea.actor }} + run: | + docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . + + - name: Build and push Docker image using Buildx + env: + GITEA_REGISTRY_URL: 'git.bepastem.com' + #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} + IMAGE_NAME: my-app2 + #IMAGE_NAME: ${{ vars.IMAGE_NAME }} + OWNER: ${{ gitea.actor }} + run: | + docker buildx build \ + --platform linux/amd64 \ + -t $IMAGE_NAME:latest \ + -t $GITEA_REGISTRY_URL/$IMAGE_NAME:latest \ + #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ + --push \ + . + + - name: List Docker images + run: | + docker images + -- 2.49.0 From c429e6d59bbd2b24f8dfad32d3cf2461bad985a8 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 22:18:52 +0100 Subject: [PATCH 25/53] build app and push --- .gitea/workflows/full-latest.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index d0b147f..defdcc4 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -70,8 +70,4 @@ jobs: #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ --push \ . - - - name: List Docker images - run: | - docker images -- 2.49.0 From ba9c23cf9e41876814ba489f017a503b941ea33b Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 3 Nov 2025 22:26:15 +0100 Subject: [PATCH 26/53] list imgs --- .gitea/workflows/full-latest.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index defdcc4..98aed27 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -55,6 +55,10 @@ jobs: run: | docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . + - name: List Docker images + run: | + docker images + - name: Build and push Docker image using Buildx env: GITEA_REGISTRY_URL: 'git.bepastem.com' -- 2.49.0 From 440c6f088a80089b191cbf7bac12a6fa450aff37 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 09:27:31 +0100 Subject: [PATCH 27/53] buildx --- .gitea/workflows/full-latest.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 98aed27..a51f557 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -53,7 +53,8 @@ jobs: GITEA_REGISTRY_URL: 'git.bepastem.com' OWNER: ${{ gitea.actor }} run: | - docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . + #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . + docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . - name: List Docker images run: | @@ -70,8 +71,8 @@ jobs: docker buildx build \ --platform linux/amd64 \ -t $IMAGE_NAME:latest \ - -t $GITEA_REGISTRY_URL/$IMAGE_NAME:latest \ + -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ - --push \ + #--push \ . -- 2.49.0 From 3d4c4df2fe301c6aa432120808b43e47e6a0873e Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 11:01:16 +0100 Subject: [PATCH 28/53] buildx --- .gitea/workflows/full-latest.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index a51f557..107ef1a 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -70,9 +70,21 @@ jobs: run: | docker buildx build \ --platform linux/amd64 \ - -t $IMAGE_NAME:latest \ - -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ + -t $GITEA_REGISTRY_URL/$IMAGE_NAME:latest \ #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ #--push \ . + + - name: Push Docker image to Gitea Registry + env: + GITEA_REGISTRY_URL: 'git.bepastem.com' + #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} + IMAGE_NAME: my-app2 + #IMAGE_NAME: ${{ vars.IMAGE_NAME }} + OWNER: ${{ gitea.actor }} + run: | + docker login $GITEA_REGISTRY_URL -u ${{ gitea.actor }} -p ${{ secrets.ACCESS_TOKEN }} + docker push $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest + #docker push ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest + pwd -- 2.49.0 From 1c320a86bd72f82fe99daecff9adf9c8a74c51b2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 11:06:44 +0100 Subject: [PATCH 29/53] fix build --- .gitea/workflows/full-latest.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 107ef1a..dada5f9 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -52,6 +52,7 @@ jobs: env: GITEA_REGISTRY_URL: 'git.bepastem.com' OWNER: ${{ gitea.actor }} + IMAGE_NAME: my-app2 run: | #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . @@ -70,7 +71,8 @@ jobs: run: | docker buildx build \ --platform linux/amd64 \ - -t $GITEA_REGISTRY_URL/$IMAGE_NAME:latest \ + -t $IMAGE_NAME:latest \ + -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ #--push \ . -- 2.49.0 From 431038123fefd4bd3c3f90b086143b09ceb2f1a2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 11:23:32 +0100 Subject: [PATCH 30/53] fix buildx --- .gitea/workflows/full-latest.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index dada5f9..5d1c8f7 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -65,17 +65,20 @@ jobs: env: GITEA_REGISTRY_URL: 'git.bepastem.com' #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} - IMAGE_NAME: my-app2 + IMAGE_NAME: my-app-backend + APP_VERSION: v1.0.0 #IMAGE_NAME: ${{ vars.IMAGE_NAME }} OWNER: ${{ gitea.actor }} run: | - docker buildx build \ - --platform linux/amd64 \ - -t $IMAGE_NAME:latest \ - -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ - #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ - #--push \ - . + #docker buildx build --no-cache -t eberen/services:backend-$APP_VERSION . + docker buildx build --platform linux/amd64 -t $OWNER/services:$IMAGE_NAME-backend-$APP_VERSION . + #docker buildx build \ + # --platform linux/amd64 \ + # -t $IMAGE_NAME:latest \ + # -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ + # #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ + # #--push \ + # . - name: Push Docker image to Gitea Registry env: -- 2.49.0 From 0696657b78286323b7ef6876a4e63259ffc1513d Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 11:36:30 +0100 Subject: [PATCH 31/53] push to registry --- .gitea/workflows/full-latest.yaml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 5d1c8f7..cda49f8 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -57,10 +57,6 @@ jobs: #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . - - name: List Docker images - run: | - docker images - - name: Build and push Docker image using Buildx env: GITEA_REGISTRY_URL: 'git.bepastem.com' @@ -80,16 +76,23 @@ jobs: # #--push \ # . + - name: List Docker images + run: | + docker images + - name: Push Docker image to Gitea Registry env: - GITEA_REGISTRY_URL: 'git.bepastem.com' + #GITEA_REGISTRY_URL: 'git.bepastem.com' #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} - IMAGE_NAME: my-app2 #IMAGE_NAME: ${{ vars.IMAGE_NAME }} - OWNER: ${{ gitea.actor }} + GITEA_USERNAME: ${{ gitea.actor }} + GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} + IMAGE_NAME: ${{ vars.GITEA_REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest + GITEA_REGISTRY_URL: ${{ vars.GITEA_REGISTRY_URL }} + #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} run: | - docker login $GITEA_REGISTRY_URL -u ${{ gitea.actor }} -p ${{ secrets.ACCESS_TOKEN }} - docker push $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest - #docker push ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest + docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN + docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME + #docker push $GITEA_REGISTRY_URL/GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From b39ff5387ba158fe1fdd8b8d7039c4acab74dd31 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 12:36:47 +0100 Subject: [PATCH 32/53] push to registry --- .gitea/workflows/full-latest.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index cda49f8..f806fe5 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -82,17 +82,18 @@ jobs: - name: Push Docker image to Gitea Registry env: - #GITEA_REGISTRY_URL: 'git.bepastem.com' + #GITEA_REGISTRY_URL: 'https://git.bepastem.com' #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} #IMAGE_NAME: ${{ vars.IMAGE_NAME }} GITEA_USERNAME: ${{ gitea.actor }} GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} - IMAGE_NAME: ${{ vars.GITEA_REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest GITEA_REGISTRY_URL: ${{ vars.GITEA_REGISTRY_URL }} + #IMAGE_NAME: ${{ vars.GITEA_REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} run: | + echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN - docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME - #docker push $GITEA_REGISTRY_URL/GITEA_USERNAME/$IMAGE_NAME + docker push $GITEA_REGISTRY_URL/$GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app2:latest + #docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From f0d55765a8cd4957ad318247a8b0bf9dbdfb0f63 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 12:44:46 +0100 Subject: [PATCH 33/53] read registry --- .gitea/workflows/full-latest.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index f806fe5..b06d059 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -50,7 +50,7 @@ jobs: #Build Docker image - name: Build Docker image env: - GITEA_REGISTRY_URL: 'git.bepastem.com' + GITEA_REGISTRY_URL: 'https://git.bepastem.com' OWNER: ${{ gitea.actor }} IMAGE_NAME: my-app2 run: | @@ -59,8 +59,8 @@ jobs: - name: Build and push Docker image using Buildx env: - GITEA_REGISTRY_URL: 'git.bepastem.com' - #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} + GITEA_REGISTRY_URL: 'https://git.bepastem.com' + #GITEA_REGISTRY_URL: ${{ secrets.REGISTRY_URL }} IMAGE_NAME: my-app-backend APP_VERSION: v1.0.0 #IMAGE_NAME: ${{ vars.IMAGE_NAME }} @@ -87,9 +87,9 @@ jobs: #IMAGE_NAME: ${{ vars.IMAGE_NAME }} GITEA_USERNAME: ${{ gitea.actor }} GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} - GITEA_REGISTRY_URL: ${{ vars.GITEA_REGISTRY_URL }} - #IMAGE_NAME: ${{ vars.GITEA_REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest - #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} + GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} + #IMAGE_NAME: ${{ vars.REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest + #REGISTRY_URL: ${{ secrets.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN -- 2.49.0 From c125edb16e2cd68250b2c530e6fa763ca00dd436 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 12:49:52 +0100 Subject: [PATCH 34/53] log registry --- .gitea/workflows/full-latest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index b06d059..dbcf3f8 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -54,8 +54,8 @@ jobs: OWNER: ${{ gitea.actor }} IMAGE_NAME: my-app2 run: | - #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . - docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . + #docker build -t $OWNER/my-app:latest . + docker build -t $OWNER/$IMAGE_NAME:latest . - name: Build and push Docker image using Buildx env: @@ -93,7 +93,7 @@ jobs: run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN - docker push $GITEA_REGISTRY_URL/$GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app2:latest + docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest #docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From 347f920297e7ec2c37ba51384dc74ddbcd6ccc86 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 13:08:04 +0100 Subject: [PATCH 35/53] login --- .gitea/workflows/full-latest.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index dbcf3f8..8980443 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -92,7 +92,9 @@ jobs: #REGISTRY_URL: ${{ secrets.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" - docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN + #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN + # Login securely + echo "$GITEA_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest #docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From 4ad07376360b3b04d5d26df3b55064a0dd968837 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 13:17:16 +0100 Subject: [PATCH 36/53] token --- .gitea/workflows/full-latest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 8980443..cd07af5 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -50,7 +50,6 @@ jobs: #Build Docker image - name: Build Docker image env: - GITEA_REGISTRY_URL: 'https://git.bepastem.com' OWNER: ${{ gitea.actor }} IMAGE_NAME: my-app2 run: | @@ -59,7 +58,7 @@ jobs: - name: Build and push Docker image using Buildx env: - GITEA_REGISTRY_URL: 'https://git.bepastem.com' + GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} #GITEA_REGISTRY_URL: ${{ secrets.REGISTRY_URL }} IMAGE_NAME: my-app-backend APP_VERSION: v1.0.0 @@ -86,7 +85,8 @@ jobs: #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} #IMAGE_NAME: ${{ vars.IMAGE_NAME }} GITEA_USERNAME: ${{ gitea.actor }} - GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} + #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} + GITEA_TOKEN: ${{ secrets.ALL_REPO_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} #IMAGE_NAME: ${{ vars.REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest #REGISTRY_URL: ${{ secrets.REGISTRY_URL }} -- 2.49.0 From 02985c819fa4f526c85543d8f6b5df815f92cc1b Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 13:18:27 +0100 Subject: [PATCH 37/53] token --- .gitea/workflows/full-latest.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index cd07af5..0d817ef 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -94,7 +94,8 @@ jobs: echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN # Login securely - echo "$GITEA_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin + #echo "$GITEA_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin + echo "$ALL_REPO_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest #docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From b5a5bd1dcd1453739fb3dce3eb10292fcf800a6c Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 13:24:15 +0100 Subject: [PATCH 38/53] login token --- .gitea/workflows/full-latest.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 0d817ef..49dbd1e 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -87,6 +87,7 @@ jobs: GITEA_USERNAME: ${{ gitea.actor }} #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} GITEA_TOKEN: ${{ secrets.ALL_REPO_TOKEN }} + LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} #IMAGE_NAME: ${{ vars.REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest #REGISTRY_URL: ${{ secrets.REGISTRY_URL }} @@ -95,7 +96,7 @@ jobs: #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN # Login securely #echo "$GITEA_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin - echo "$ALL_REPO_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin + echo "$LOGIN_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest #docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From dc151f705e6861884f62b0091cb50f89733aa51a Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 13:42:57 +0100 Subject: [PATCH 39/53] login token --- .gitea/workflows/full-latest.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 49dbd1e..d105e40 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -51,9 +51,10 @@ jobs: - name: Build Docker image env: OWNER: ${{ gitea.actor }} - IMAGE_NAME: my-app2 + IMAGE_NAME: my-app run: | #docker build -t $OWNER/my-app:latest . + # registry.domain.com//my-app:latest e.g. git.bepastem.com/eberen/my-app:latest docker build -t $OWNER/$IMAGE_NAME:latest . - name: Build and push Docker image using Buildx @@ -61,7 +62,7 @@ jobs: GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} #GITEA_REGISTRY_URL: ${{ secrets.REGISTRY_URL }} IMAGE_NAME: my-app-backend - APP_VERSION: v1.0.0 + APP_VERSION: v1.0.0 | 'latest' #IMAGE_NAME: ${{ vars.IMAGE_NAME }} OWNER: ${{ gitea.actor }} run: | @@ -81,23 +82,16 @@ jobs: - name: Push Docker image to Gitea Registry env: - #GITEA_REGISTRY_URL: 'https://git.bepastem.com' - #GITEA_REGISTRY_URL: ${{ secrets.GITEA_REGISTRY_URL }} - #IMAGE_NAME: ${{ vars.IMAGE_NAME }} GITEA_USERNAME: ${{ gitea.actor }} #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} GITEA_TOKEN: ${{ secrets.ALL_REPO_TOKEN }} - LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} - #IMAGE_NAME: ${{ vars.REGISTRY_URL }}/GITEA_USERNAME/my-app2:latest - #REGISTRY_URL: ${{ secrets.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN # Login securely - #echo "$GITEA_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin echo "$LOGIN_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest - #docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/$IMAGE_NAME pwd -- 2.49.0 From d0312ba705e9ef5e816d5a13be4be1d04e5b9a37 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 13:55:38 +0100 Subject: [PATCH 40/53] login token --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index d105e40..ca2b996 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -62,7 +62,7 @@ jobs: GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} #GITEA_REGISTRY_URL: ${{ secrets.REGISTRY_URL }} IMAGE_NAME: my-app-backend - APP_VERSION: v1.0.0 | 'latest' + APP_VERSION: v1.0.0 #IMAGE_NAME: ${{ vars.IMAGE_NAME }} OWNER: ${{ gitea.actor }} run: | -- 2.49.0 From 30e2edad9109b177136182935390d9a40505cb50 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 16:02:11 +0100 Subject: [PATCH 41/53] login token --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index ca2b996..e0a2569 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -85,7 +85,7 @@ jobs: GITEA_USERNAME: ${{ gitea.actor }} #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} GITEA_TOKEN: ${{ secrets.ALL_REPO_TOKEN }} - #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" -- 2.49.0 From b9bbb68ee9a45d9263f229c7d2b13eee62232f07 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 17:58:05 +0100 Subject: [PATCH 42/53] login token2 --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index e0a2569..a1072ac 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -91,7 +91,7 @@ jobs: echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN # Login securely - echo "$LOGIN_TOKEN" | docker login "$GITEA_REGISTRY_URL" -u "$GITEA_USERNAME" --password-stdin + echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest pwd -- 2.49.0 From 73a711d8ecb09fdd43bc226adeff1cd394b73abf Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 17:58:33 +0100 Subject: [PATCH 43/53] login token2 --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index a1072ac..c66a093 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -91,7 +91,7 @@ jobs: echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN # Login securely - echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME --password-stdin + echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest pwd -- 2.49.0 From 10aaf15585189cd492aba8a0a484d7acc03aa9d7 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:11:38 +0100 Subject: [PATCH 44/53] login token 2 --- .gitea/workflows/full-latest.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index c66a093..8669047 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -84,14 +84,18 @@ jobs: env: GITEA_USERNAME: ${{ gitea.actor }} #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} - GITEA_TOKEN: ${{ secrets.ALL_REPO_TOKEN }} - LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + GITEA_TOKEN: ${{ secrets.LOGIN_TOKEN }} + LOGIN_TOKEN: ${{ env.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" + echo "LOGIN_TOKEN: $LOGIN_TOKEN" + echo "GITEA_TOKEN: $GITEA_TOKEN" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN # Login securely - echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin + #echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin + echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest pwd -- 2.49.0 From a86b4301eddec4e1d81c462059cb37d6a52ed7f8 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:20:47 +0100 Subject: [PATCH 45/53] login token 3 --- .gitea/workflows/full-latest.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 8669047..a5eec04 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -85,14 +85,12 @@ jobs: GITEA_USERNAME: ${{ gitea.actor }} #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - GITEA_TOKEN: ${{ secrets.LOGIN_TOKEN }} - LOGIN_TOKEN: ${{ env.LOGIN_TOKEN }} + $LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" echo "LOGIN_TOKEN: $LOGIN_TOKEN" - echo "GITEA_TOKEN: $GITEA_TOKEN" - #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $GITEA_TOKEN + #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $LOGIN_TOKEN # Login securely #echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin -- 2.49.0 From 506a90f7d18648feb5cac1d9f0aab846773a20b5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:27:32 +0100 Subject: [PATCH 46/53] login token 3 --- .gitea/workflows/full-latest.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index a5eec04..df466dc 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -47,6 +47,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + #NOTE: Images must follow this naming convention: - {registry}/{owner}/{image} #Build Docker image - name: Build Docker image env: @@ -86,14 +87,19 @@ jobs: #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} $LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + $LOGIN_TOKEN_1: ${{ secrets.GITEA_TOKEN }} + $LOGIN_TOKEN_2: ${{ env.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" echo "LOGIN_TOKEN: $LOGIN_TOKEN" + echo "LOGIN_TOKEN_1: $LOGIN_TOKEN_1" + echo "LOGIN_TOKEN_2: $LOGIN_TOKEN_2" + echo "REGISTRY_URL: $REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $LOGIN_TOKEN # Login securely - #echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin - echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin + echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin + #echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest pwd -- 2.49.0 From d4f8820df21039cbf346a8c183f1a6872ba99b73 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:31:37 +0100 Subject: [PATCH 47/53] login token 3 --- .gitea/workflows/full-latest.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index df466dc..0f468e6 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -51,12 +51,13 @@ jobs: #Build Docker image - name: Build Docker image env: + GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} OWNER: ${{ gitea.actor }} IMAGE_NAME: my-app run: | - #docker build -t $OWNER/my-app:latest . + #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . # registry.domain.com//my-app:latest e.g. git.bepastem.com/eberen/my-app:latest - docker build -t $OWNER/$IMAGE_NAME:latest . + docker build -t #GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . - name: Build and push Docker image using Buildx env: @@ -68,7 +69,7 @@ jobs: OWNER: ${{ gitea.actor }} run: | #docker buildx build --no-cache -t eberen/services:backend-$APP_VERSION . - docker buildx build --platform linux/amd64 -t $OWNER/services:$IMAGE_NAME-backend-$APP_VERSION . + docker buildx build --platform linux/amd64 -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME-backend:$APP_VERSION . #docker buildx build \ # --platform linux/amd64 \ # -t $IMAGE_NAME:latest \ @@ -86,9 +87,9 @@ jobs: GITEA_USERNAME: ${{ gitea.actor }} #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - $LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - $LOGIN_TOKEN_1: ${{ secrets.GITEA_TOKEN }} - $LOGIN_TOKEN_2: ${{ env.LOGIN_TOKEN }} + LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + LOGIN_TOKEN_1: ${{ secrets.GITEA_TOKEN }} + LOGIN_TOKEN_2: ${{ env.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" @@ -98,8 +99,8 @@ jobs: echo "REGISTRY_URL: $REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $LOGIN_TOKEN # Login securely - echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin - #echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin + #echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin + echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest pwd -- 2.49.0 From 3881c28920564569b5180ec085a0cb198bd0ac53 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:34:16 +0100 Subject: [PATCH 48/53] fix login --- .gitea/workflows/full-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 0f468e6..c05d5fe 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -57,7 +57,7 @@ jobs: run: | #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . # registry.domain.com//my-app:latest e.g. git.bepastem.com/eberen/my-app:latest - docker build -t #GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . + docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . - name: Build and push Docker image using Buildx env: -- 2.49.0 From 82d5d4111a892982d55b6c4062a1e1eda1867912 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:37:39 +0100 Subject: [PATCH 49/53] fix login 1 --- .gitea/workflows/full-latest.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index c05d5fe..4af3dd9 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -95,12 +95,11 @@ jobs: echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" echo "LOGIN_TOKEN: $LOGIN_TOKEN" echo "LOGIN_TOKEN_1: $LOGIN_TOKEN_1" - echo "LOGIN_TOKEN_2: $LOGIN_TOKEN_2" - echo "REGISTRY_URL: $REGISTRY_URL" + echo "REGISTRY_URL: $GITEA_REGISTRY_URL" #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $LOGIN_TOKEN # Login securely - #echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin - echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin + echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin + #echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest pwd -- 2.49.0 From dc732c7ed09aba0d4f840351fa93aeb5a3cf12ac Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:45:35 +0100 Subject: [PATCH 50/53] fix login 2 --- .gitea/workflows/full-latest.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 4af3dd9..b619be6 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -69,7 +69,7 @@ jobs: OWNER: ${{ gitea.actor }} run: | #docker buildx build --no-cache -t eberen/services:backend-$APP_VERSION . - docker buildx build --platform linux/amd64 -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME-backend:$APP_VERSION . + docker buildx build --platform linux/amd64 -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:$APP_VERSION . #docker buildx build \ # --platform linux/amd64 \ # -t $IMAGE_NAME:latest \ @@ -85,21 +85,19 @@ jobs: - name: Push Docker image to Gitea Registry env: GITEA_USERNAME: ${{ gitea.actor }} - #GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }} - #LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - LOGIN_TOKEN_1: ${{ secrets.GITEA_TOKEN }} - LOGIN_TOKEN_2: ${{ env.LOGIN_TOKEN }} + #LOGIN_TOKEN_1: ${{ secrets.GITEA_TOKEN }} + #LOGIN_TOKEN_2: ${{ env.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" echo "LOGIN_TOKEN: $LOGIN_TOKEN" - echo "LOGIN_TOKEN_1: $LOGIN_TOKEN_1" echo "REGISTRY_URL: $GITEA_REGISTRY_URL" - #docker login $GITEA_REGISTRY_URL -u $GITEA_USERNAME -p $LOGIN_TOKEN # Login securely echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin - #echo "$LOGIN_TOKEN" | docker login ghcr.io -u $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest + docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest + docker logout $GITEA_REGISTRY_URL + docker system prune -f pwd -- 2.49.0 From 5c6cf1fde87aa43d847ca84982ac83eeca2ae263 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 18:50:23 +0100 Subject: [PATCH 51/53] fix login 2 --- .gitea/workflows/full-latest.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index b619be6..9306d99 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -86,18 +86,14 @@ jobs: env: GITEA_USERNAME: ${{ gitea.actor }} LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - #LOGIN_TOKEN_1: ${{ secrets.GITEA_TOKEN }} - #LOGIN_TOKEN_2: ${{ env.LOGIN_TOKEN }} GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} run: | - echo "GITEA_REGISTRY_URL: $GITEA_REGISTRY_URL" - echo "LOGIN_TOKEN: $LOGIN_TOKEN" - echo "REGISTRY_URL: $GITEA_REGISTRY_URL" # Login securely echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest docker logout $GITEA_REGISTRY_URL docker system prune -f - pwd + pwd + cd && ls -la -- 2.49.0 From 362ed8e34614699e71066e95979baea55e8a2810 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 19:02:56 +0100 Subject: [PATCH 52/53] fix build and bush be image --- .gitea/workflows/full-latest.yaml | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/full-latest.yaml index 9306d99..98d84dd 100644 --- a/.gitea/workflows/full-latest.yaml +++ b/.gitea/workflows/full-latest.yaml @@ -1,5 +1,5 @@ -name: Gitea Actions Demo 2 -run-name: ${{ gitea.actor }} is testing out Gitea Actions +name: Full Build and Docker Push Workflow +run-name: ${{ gitea.actor }} is running a full build and Docker push workflow on: push: @@ -26,10 +26,6 @@ jobs: - name: Clone the repository uses: actions/checkout@v4 - #with: - #repository: ${{ gitea.repository }} - #token: ${{ secrets.ACCESS_TOKEN }} - #fetch-depth: 0 - name: Set up Java uses: actions/setup-java@v5 @@ -47,8 +43,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - #NOTE: Images must follow this naming convention: - {registry}/{owner}/{image} - #Build Docker image + #Build Docker image - Images must follow this naming convention: - {registry}/{owner}/{image} - name: Build Docker image env: GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} @@ -62,26 +57,18 @@ jobs: - name: Build and push Docker image using Buildx env: GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} - #GITEA_REGISTRY_URL: ${{ secrets.REGISTRY_URL }} IMAGE_NAME: my-app-backend APP_VERSION: v1.0.0 - #IMAGE_NAME: ${{ vars.IMAGE_NAME }} OWNER: ${{ gitea.actor }} + LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} run: | - #docker buildx build --no-cache -t eberen/services:backend-$APP_VERSION . docker buildx build --platform linux/amd64 -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:$APP_VERSION . #docker buildx build \ # --platform linux/amd64 \ - # -t $IMAGE_NAME:latest \ - # -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ - # #-t ${{ secrets.GITEA_REGISTRY_URL }}/$OWNER/$IMAGE_NAME:latest \ + # #-t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ # #--push \ # . - - name: List Docker images - run: | - docker images - - name: Push Docker image to Gitea Registry env: GITEA_USERNAME: ${{ gitea.actor }} @@ -91,9 +78,11 @@ jobs: # Login securely echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest - docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest docker logout $GITEA_REGISTRY_URL + + - name: Cleanup + run: | + docker images -a docker system prune -f - pwd - cd && ls -la + echo "Cleanup done." -- 2.49.0 From 969ede75b1511e12bba0b9061aaad51718d02f11 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Nov 2025 19:03:42 +0100 Subject: [PATCH 53/53] rename file --- .gitea/workflows/{full-latest.yaml => be-img-build-and-push.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitea/workflows/{full-latest.yaml => be-img-build-and-push.yaml} (100%) diff --git a/.gitea/workflows/full-latest.yaml b/.gitea/workflows/be-img-build-and-push.yaml similarity index 100% rename from .gitea/workflows/full-latest.yaml rename to .gitea/workflows/be-img-build-and-push.yaml -- 2.49.0