Skip to content

Commit

Permalink
bug fixes for cicd
Browse files Browse the repository at this point in the history
  • Loading branch information
illinoisrobert committed Aug 6, 2024
1 parent b9023cf commit 889c6ca
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
24 changes: 12 additions & 12 deletions beta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ FROM golang:bookworm AS builder
RUN ldd --version
WORKDIR /build
COPY . .
# RUN cd bld-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./bld.go
# RUN cd bld-dir && ./bld -is args-bld
# RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtExec.go
# RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtDesc.go
# RUN cd sim-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./sim.go
RUN cd bld-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./bld.go
RUN cd bld-dir && ./bld -is args-bld
RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtExec.go
RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtDesc.go
RUN cd sim-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./sim.go

# Production phase
FROM debian:bookworm
#RUN apt update && apt upgrade -y && apt install -y \
# python3 \
# python3-tk \
# python3-pil \
# python3-pil.imagetk vim-nox \
# python3-yaml \
# python3-matplotlib
RUN apt update && apt upgrade -y && apt install -y \
python3 \
python3-tk \
python3-pil \
python3-pil.imagetk vim-nox \
python3-yaml \
python3-matplotlib
WORKDIR /app
COPY --from=builder /build/. .
5 changes: 3 additions & 2 deletions beta/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@
pfx="ghcr.io/iti/pcesapps"

now=$(date -u +%F-%H-%M-%S)
if "$1" = ""

if [ "$1" = "" ]
then
image="$pfx-test"
latest=
latest=( )
else
image="$pfx-$1"
shift
Expand Down

0 comments on commit 889c6ca

Please sign in to comment.