more container fiddling
This commit is contained in:
parent
12523ac1bd
commit
5c097d5b2c
@ -1,7 +1,7 @@
|
|||||||
.github
|
.github
|
||||||
.jenkins
|
.jenkins
|
||||||
.git
|
.git
|
||||||
pkg
|
draught_web/pkg
|
||||||
target
|
target
|
||||||
**/dist
|
**/dist
|
||||||
**/node_modules
|
**/node_modules
|
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@ -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
|
@ -6,8 +6,6 @@ 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()
|
||||||
@ -16,7 +14,6 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
cleanWs()
|
cleanWs()
|
||||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user