Merge pull request 'Updated docker to ci-docker-images (migration)' (#15) from dev into main
Reviewed-on: #15
This commit is contained in:
commit
eaab523a2a
4 changed files with 6 additions and 6 deletions
|
@ -7,7 +7,7 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
unlighthouse:
|
unlighthouse:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
container: forgejo.neshweb.net/firq/unlighthouse-docker:latest
|
container: forgejo.neshweb.net/ci-docker-images/unlighthouse-docker:latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: https://code.forgejo.org/actions/checkout@v3
|
uses: https://code.forgejo.org/actions/checkout@v3
|
||||||
|
|
|
@ -4,7 +4,7 @@ COPY . .
|
||||||
RUN npm i
|
RUN npm i
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM forgejo.neshweb.net/firq/website-serve-docker:latest AS runtime
|
FROM forgejo.neshweb.net/ci-docker-images/website-serve-docker:latest 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
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "@firq/fgosite",
|
"name": "@firq/fgosite",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "0.1.12",
|
"version": "0.1.13",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "astro dev",
|
"dev": "astro dev",
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
layout: ../../layouts/blogPost.astro
|
layout: ../../layouts/blogPost.astro
|
||||||
title: 'Migrating to Forgejo'
|
title: 'Migrating to Forgejo'
|
||||||
pubDate: 2023-12-23
|
pubDate: 2023-12-23
|
||||||
description: 'My small recollection of migrating this site + CI to Forgejo'
|
description: 'My short recollection of migrating this site + CI to Forgejo'
|
||||||
author: 'Firq'
|
author: 'Firq'
|
||||||
tags: ['astro', 'docker', 'forgejo']
|
tags: ['astro', 'docker', 'forgejo']
|
||||||
---
|
---
|
||||||
|
@ -58,7 +58,7 @@ COPY . .
|
||||||
RUN npm i
|
RUN npm i
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM forgejo.neshweb.net/firq/website-serve-docker:latest AS runtime
|
FROM forgejo.neshweb.net/ci-docker-images/website-serve-docker:latest 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
|
||||||
|
@ -138,7 +138,7 @@ With this container, the CI step to actually run the tests became a lot easier:
|
||||||
jobs:
|
jobs:
|
||||||
unlighthouse:
|
unlighthouse:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
container: forgejo.neshweb.net/firq/unlighthouse-docker:latest
|
container: forgejo.neshweb.net/ci-docker-images/unlighthouse-docker:latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: https://code.forgejo.org/actions/checkout@v3
|
uses: https://code.forgejo.org/actions/checkout@v3
|
||||||
|
|
Loading…
Reference in a new issue