more container fiddling

This commit is contained in:
Andy Pack 2024-02-01 19:05:13 +00:00
parent 12523ac1bd
commit 5c097d5b2c
Signed by: sarsoo
GPG Key ID: A55BA3536A5E0ED7
4 changed files with 5 additions and 10 deletions

View File

@ -1,7 +1,7 @@
.github .github
.jenkins .jenkins
.git .git
pkg draught_web/pkg
target target
**/dist **/dist
**/node_modules **/node_modules

View File

@ -83,7 +83,5 @@ jobs:
- name: Build & Push Container - name: Build & Push Container
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
file: ./draught_web/Dockerfile
context: ./draught_web
push: true push: true
tags: sarsoo/draught:latest tags: sarsoo/draught:latest

View File

@ -6,12 +6,9 @@ pipeline {
when { branch 'master' } when { branch 'master' }
steps { steps {
script { script {
dir('draught_web') docker.withRegistry('https://registry.sarsoo.xyz', 'git-registry-creds')
{ {
docker.withRegistry('https://registry.sarsoo.xyz', 'git-registry-creds') docker.build("sarsoo/draught:latest").push()
{
docker.build("sarsoo/draught:latest").push()
}
} }
} }
} }

View File

@ -2,7 +2,7 @@ FROM rust:1.71 AS rust-build
RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
COPY .. /draught COPY . /draught
WORKDIR /draught/draught_web WORKDIR /draught/draught_web
RUN wasm-pack build --release RUN wasm-pack build --release
@ -12,7 +12,7 @@ RUN cargo doc --no-deps --document-private-items
FROM node:20-alpine AS js-build FROM node:20-alpine AS js-build
COPY .. /draught COPY . /draught
WORKDIR /draught/draught_web WORKDIR /draught/draught_web
COPY --from=rust-build /draught/draught_web/pkg /draught/draught_web/pkg COPY --from=rust-build /draught/draught_web/pkg /draught/draught_web/pkg