From 13f6db18f2ef13af4dc04a5b21a3c7d2595f2d8e Mon Sep 17 00:00:00 2001 From: Sergei Poljanski Date: Tue, 25 Nov 2025 05:24:04 +0200 Subject: [PATCH] ci/cd --- .dockerignore | 5 +++ .forgejo/workflows/deploy.yaml | 79 ++++++++++++++++++++++++++++++++++ Dockerfile | 15 +++++++ docker-compose.yml | 20 +++++++++ id_ed25519.pub | 1 + id_rsa.pub | 1 - index.html | 7 +-- 7 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 .dockerignore create mode 100644 .forgejo/workflows/deploy.yaml create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 id_ed25519.pub delete mode 100644 id_rsa.pub diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..89eeced --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.git +.forgejo +.DS_Store +README.md +.dockerignore diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..136b842 --- /dev/null +++ b/.forgejo/workflows/deploy.yaml @@ -0,0 +1,79 @@ +name: Build and Deploy to Production + +on: + push: + branches: + - main + +jobs: + build: + runs-on: arch-latest + container: + image: gcr.io/kaniko-project/executor:debug + outputs: + image_tag: ${{ steps.build_image.outputs.image_tag }} + steps: + - name: Build and push Docker Image using Kaniko + id: build_image + run: | + # Tags + SHORT_SHA=${GITHUB_SHA::8} + IMAGE_BASE=${{ secrets.FORGEJO_REGISTRY }}/${{ secrets.FORGEJO_USER }}/asxpio + IMAGE_TAG=${IMAGE_BASE}:${SHORT_SHA} + IMAGE_LATEST=${IMAGE_BASE}:latest + + # Auth Conf + mkdir -p /kaniko/.docker + echo "{\"auths\":{\"${{ secrets.FORGEJO_REGISTRY }}\":{\"auth\":\"$(echo -n ${{ secrets.FORGEJO_USER }}:${{ secrets.FORGEJO_TOKEN }} | base64)\"}}}" > /kaniko/.docker/config.json + + # Build & push + /kaniko/executor \ + --context=git://${{ secrets.FORGEJO_REGISTRY }}/${{ github.repository }}.git \ + --git=branch=${{ github.ref_name }} \ + --destination=$IMAGE_TAG \ + --destination=$IMAGE_LATEST + + # Output the specific tag for deployment + echo "image_tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT + + deploy: + runs-on: arch-latest + needs: build + steps: + - name: Install dependencies + run: | + pacman -Syu --noconfirm nodejs openssh rsync + + - name: Checkout code + uses: actions/checkout@v4 + + - name: Deploy docker-compose.yml + uses: easingthemes/ssh-deploy@v5.1.0 + with: + SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_SSH_KEY }} + REMOTE_HOST: ${{ secrets.DEPLOY_IP }} + REMOTE_USER: ${{ secrets.DEPLOY_USER }} + SOURCE: "docker-compose.yml" + TARGET: "/opt/asxpio/" + + - name: Deploy and update container + uses: appleboy/ssh-action@v1.2.3 + env: + NEW_IMAGE: ${{ needs.build.outputs.image_tag }} + with: + host: ${{ secrets.DEPLOY_IP }} + username: ${{ secrets.DEPLOY_USER }} + key: ${{ secrets.DEPLOY_SSH_KEY }} + envs: NEW_IMAGE + script: | + cd /opt/asxpio + + sed -i "s|image:.*|image: $NEW_IMAGE|" docker-compose.yml + + docker pull $NEW_IMAGE + docker compose up -d + + sleep 5 + docker ps | grep asxpio || exit 1 + + echo "Deployment successful!" diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..800705d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM nginx:alpine + +# Copy website files to nginx html directory +COPY index.html /usr/share/nginx/html/ +COPY id_ed25519.pub /usr/share/nginx/html/ +COPY copyPGP.js /usr/share/nginx/html/ +COPY copySSH.js /usr/share/nginx/html/ +COPY hedgehod.png /usr/share/nginx/html/ +COPY pgp.pub /usr/share/nginx/html/ + +# Expose port 80 +EXPOSE 80 + +# Start nginx +CMD ["nginx", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..65e1dcf --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,20 @@ +services: + asxpio: + # Image will be dynamically updated during deployment + # Format: registry.example.com/user/czsk:sha_tag + image: nginx:alpine + container_name: asxpio + restart: unless-stopped + networks: + - traefik + labels: + - "traefik.enable=true" + - "traefik.http.routers.asxpio.rule=Host(`asxp.io`) || Host(`www.asxp.io`)" + - "traefik.http.routers.asxpio.entrypoints=websecure" + - "traefik.http.routers.asxpio.tls=true" + - "traefik.http.routers.asxpio.tls.certresolver=letsencrypt" + - "traefik.http.services.asxpio.loadbalancer.server.port=80" + +networks: + traefik: + external: true diff --git a/id_ed25519.pub b/id_ed25519.pub new file mode 100644 index 0000000..a023c28 --- /dev/null +++ b/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZ+/5F7SxdTVW47iiStLpGK77oWfR5NgaK4tTSR/aVB me@asxp.io diff --git a/id_rsa.pub b/id_rsa.pub deleted file mode 100644 index 3667e08..0000000 --- a/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC//ljrf65xbFyGmy/xeZs5GZvkmufCioqIGYguR3c8c/Ff9HiA4oMRT53Qs16KMuXRg62NusVQvJsvyPRSARpBFsoPiZ/YNBteWlqT1aVqeZwPOfUfFycQ2T8a9qtDnZ0WhamSlJMSAHQPkxXNA6S2ZE9y+dMzMc5qPeRwdsQmuvkxjual/35t9qTgCAG7LvKCKPJkLL5YpwLoqWYWTqSJ6RxNLTYNgIhJBZirzB5rNiFDDupnOuTKSpyRJNxyBSapNge5rCnGQYIeoJ4fi+FTi5wzjlC3hC0BN4Oc/zrm1nS9lyPXQS8KV5/vcQlPrvYZmv0LneeQ/gH/jJsSlwRp2qIatoASSfTlz1y1bOOYtPFojJPikXiXeZMCdlam1II6B94z1ybOIO8TqyKDVs4eHRFfYO72zv0sGsTr7t0C7+N9Wrpmhk38zdlLagZ6HO7KSyoAHm+fQc58fXmOhz4vfYrbmYRPgO0VO03fEb7lSFPPLaSseT0tayli05irJpc= asxpi@meow diff --git a/index.html b/index.html index 8f97b27..bce3186 100644 --- a/index.html +++ b/index.html @@ -56,11 +56,12 @@ - - 
gpg --recv-keys 85F7AFEDAB7D97BE667F99F24F8851660FA4121B

- 
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC//ljrf65xbFyGmy/xeZs5GZvkmufCioqIGYguR3c8c/Ff9HiA4oMRT53Qs16KMuXRg62NusVQvJsvyPRSARpBFsoPiZ/YNBteWlqT1aVqeZwPOfUfFycQ2T8a9qtDnZ0WhamSlJMSAHQPkxXNA6S2ZE9y+dMzMc5qPeRwdsQmuvkxjual/35t9qTgCAG7LvKCKPJkLL5YpwLoqWYWTqSJ6RxNLTYNgIhJBZirzB5rNiFDDupnOuTKSpyRJNxyBSapNge5rCnGQYIeoJ4fi+FTi5wzjlC3hC0BN4Oc/zrm1nS9lyPXQS8KV5/vcQlPrvYZmv0LneeQ/gH/jJsSlwRp2qIatoASSfTlz1y1bOOYtPFojJPikXiXeZMCdlam1II6B94z1ybOIO8TqyKDVs4eHRFfYO72zv0sGsTr7t0C7+N9Wrpmhk38zdlLagZ6HO7KSyoAHm+fQc58fXmOhz4vfYrbmYRPgO0VO03fEb7lSFPPLaSseT0tayli05irJpc= asxpi@meow
+ 
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZ+/5F7SxdTVW47iiStLpGK77oWfR5NgaK4tTSR/aVB me@asxp.io
+ + +

me@asxp.io or t.me/asxpi

-- 2.52.0