Update build to include server

This commit is contained in:
Condorra 2024-10-27 18:05:25 +11:00
parent 2b46066752
commit 17e289c6f2
3 changed files with 33 additions and 3 deletions

View File

@ -3,6 +3,6 @@ set -Eeuo pipefail
export HOME=$(pwd) export HOME=$(pwd)
buildah build -f wwp-repo/container/Containerfile -t quay.io/blasthavers/worldwideportal:latest buildah --root containers build -f wwp-repo/container/Containerfile -t quay.io/blasthavers/worldwideportal:latest
echo "$CONTAINER_REGISTRY_KEY" | buildah login --password-stdin --username blasthavers quay.io echo "$CONTAINER_REGISTRY_KEY" | buildah login --password-stdin --username blasthavers quay.io
buildah push quay.io/blasthavers/worldwideportal:latest buildah --root containers push quay.io/blasthavers/worldwideportal:latest

View File

@ -7,6 +7,8 @@ jobs:
plan: plan:
- get: wwp-repo - get: wwp-repo
trigger: true trigger: true
- get: wwp-server-repo
trigger: true
- task: build - task: build
config: config:
platform: linux platform: linux
@ -24,6 +26,22 @@ jobs:
- name: wwpapp - name: wwpapp
run: run:
path: wwp-repo/.ci/build path: wwp-repo/.ci/build
- task: build-server
config:
platform: linux
image_resource:
type: registry-image
source:
repository: quay.io/blasthavers/trunkrs
inputs:
- name: wwp-server-repo
caches:
- path: target
- path: .cargo
outputs:
- name: wwpserver
run:
path: wwp-server-repo/.ci/build
- task: packcontainer - task: packcontainer
privileged: true privileged: true
config: config:
@ -34,7 +52,10 @@ jobs:
repository: quay.io/buildah/stable repository: quay.io/buildah/stable
inputs: inputs:
- name: wwpapp - name: wwpapp
- name: wwpserver
- name: wwp-repo - name: wwp-repo
caches:
- name: containers
params: params:
CONTAINER_REGISTRY_KEY: ((container_registry_key)) CONTAINER_REGISTRY_KEY: ((container_registry_key))
run: run:
@ -47,3 +68,10 @@ resources:
source: source:
uri: https://git.blastmud.org/blasthavers/worldwideportal.git uri: https://git.blastmud.org/blasthavers/worldwideportal.git
branch: main branch: main
- name: wwp-server-repo
type: git
check_every: never
webhook_token: ((webhook_token))
source:
uri: https://git.blastmud.org/blasthavers/worldwideportal-server.git
branch: main

View File

@ -1,2 +1,4 @@
FROM debian:bookworm-slim FROM alpine:3.20.3
COPY wwpapp /frontendstatic COPY wwpapp /frontendstatic
COPY wwpserver/worldwideportal-server /bin/worldwideportal-server
ENTRYPOINT ["/bin/worldwideportal-server"]