Removed Dockge again, switched to alpine images

This commit is contained in:
Firq 2024-07-20 17:02:30 +02:00
parent bc5f43802f
commit d1c9f10362
Signed by: Firq
GPG key ID: 3ACC61C8CEC83C20
3 changed files with 29 additions and 51 deletions

View file

@ -65,50 +65,30 @@ jobs:
tag: ${{ github.ref_name }} tag: ${{ github.ref_name }}
prerelease: true prerelease: true
auto-deploy-dockge: # auto-deploy-dockge:
needs: [ build-site ] # needs: [ build-site ]
runs-on: docker
if: success()
container: nikolaik/python-nodejs:python3.11-nodejs21
steps:
- name: Configure pip
run: |
pip config set global.index-url https://pypi.org/simple
pip config set global.extra-index-url https://forgejo.neshweb.net/api/packages/Firq/pypi/simple/
pip config set global.timeout 60
pip config set global.trusted-host "pypi.org forgejo.neshweb.net"
- name: Install Dockge CLI
run: pip install dockge-cli
- name: Configure Dockge CLI
run: |
dockge host https://dockge.firq.dev
dockge login --user ${{ secrets.DOCKGE_USER }} --password ${{ secrets.DOCKGE_CREDENTIAL }}
- name: Check status and redeploy
run: |
dockge status firq-dev-preview
dockge update firq-dev-preview
dockge status firq-dev-preview
- name: Reset CLI
run : |
dockge logout
dockge exit
# doesn't work atm
# unlighthouse:
# needs: [publish]
# if: success()
# runs-on: docker # runs-on: docker
# container: registry.gitlab.com/gitlab-ci-utils/lighthouse:latest # if: success()
# services: # container: nikolaik/python-nodejs:python3.11-nodejs21
# website:
# image: forgejo.neshweb.net/firq/firq-dev-website:preview
# steps: # steps:
# - name: Install Dependencies # - name: Configure pip
# run: npm install @unlighthouse/cli puppeteer # run: |
# - name: Run unlighthouse # pip config set global.index-url https://pypi.org/simple
# run: node_modules/.bin/unlighthouse-ci # pip config set global.extra-index-url https://forgejo.neshweb.net/api/packages/Firq/pypi/simple/
# - name: Upload reports # pip config set global.timeout 60
# uses: actions/upload-artifact@v3 # pip config set global.trusted-host "pypi.org forgejo.neshweb.net"
# with: # - name: Install Dockge CLI
# name: unlighthouse-reports # run: pip install dockge-cli
# path: unlighthouse-reports/ # - name: Configure Dockge CLI
# run: |
# dockge host https://dockge.firq.dev
# dockge login --user ${{ secrets.DOCKGE_USER }} --password ${{ secrets.DOCKGE_CREDENTIAL }}
# - name: Check status and redeploy
# run: |
# dockge status firq-dev-preview
# dockge update firq-dev-preview
# dockge status firq-dev-preview
# - name: Reset CLI
# run : |
# dockge logout
# dockge exit

View file

@ -1,17 +1,15 @@
FROM node:lts AS build FROM node:22-alpine AS build
WORKDIR /app WORKDIR /app
COPY . . COPY . .
RUN npm i RUN npm i
RUN npm run astro telemetry disable RUN npm run astro telemetry disable
RUN npm run build RUN npm run build
FROM forgejo.neshweb.net/ci-docker-images/website-serve:0.1.3 AS runtime FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
COPY --from=build /app/dist /public COPY --from=build /app/dist /public
COPY --from=build /app/serve.json /public/serve.json COPY --from=build /app/serve.json /public/serve.json
RUN rm -r /public/data/ RUN rm -r /public/data/
ENV PORT=8081
EXPOSE 8081 EXPOSE 8081
CMD serve public/ -p 8081
CMD serve public/ -p ${PORT}

View file

@ -1,7 +1,7 @@
{ {
"name": "@firq/fgosite", "name": "@firq/fgosite",
"type": "module", "type": "module",
"version": "0.2.0-pre.4", "version": "0.2.0-pre.5",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "astro dev", "dev": "astro dev",