tudattr
/
athome
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Versioning and switchted to buildx 

Signed-off-by: Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>
pull/11/head
Tuan-Dat Tran 2024-07-25 10:21:56 +02:00
parent 1fbc2b7521
commit 991cb57c88
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -1,9 +1,9 @@
FROM rust:1.77.2 as dioxus FROM rust:1.79.0 AS dioxus
RUN cargo install dioxus-cli@^0.5 RUN cargo install dioxus-cli@^0.5
FROM dioxus as builder FROM dioxus AS builder
WORKDIR /athome/ WORKDIR /athome/
RUN apt-get update && apt-get install nodejs npm -y && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install nodejs npm libssl-dev musl-tools -y && rm -rf /var/lib/apt/lists/*
RUN npm install -D tailwindcss RUN npm install -D tailwindcss
COPY ./src/ ./src/ COPY ./src/ ./src/
COPY ./assets/ ./assets/ COPY ./assets/ ./assets/
@ -13,7 +13,7 @@ COPY ./Dioxus.toml ./Dioxus.toml
COPY ./tailwind.config.js ./tailwind.config.js COPY ./tailwind.config.js ./tailwind.config.js
RUN npx tailwindcss -i ./input.css -o ./assets/tailwind.css && dx build --platform fullstack --release RUN npx tailwindcss -i ./input.css -o ./assets/tailwind.css && dx build --platform fullstack --release
FROM dioxus as runner FROM dioxus AS runner
WORKDIR /app/ WORKDIR /app/
COPY --from=builder /athome/docs/ ./docs/ COPY --from=builder /athome/docs/ ./docs/
CMD [ "./docs/athome" ] CMD [ "./docs/athome" ]

12
scripts/docker-push.sh
View File

@ -1,16 +1,20 @@
#!/bin/sh #!/bin/sh
VERSION=$(git branch | grep "*" | awk '{ print $2 }') TAG=$(git branch | grep "*" | awk '{ print $2 }')
LOCAL_IMAGE="athome" LOCAL_IMAGE="athome"
REGISTRY="mos4" REGISTRY="mos4"
REMOTE_IMAGE="athome" REMOTE_IMAGE="athome"
DOCKERFILE="./Dockerfile" DOCKERFILE="./Dockerfile"
echo "DOCKERFILE: $DOCKERFILE" echo "DOCKERFILE: $DOCKERFILE"
echo "VERSION: $VERSION" echo "TAG: $TAG"
echo "LOCAL_IMAGE: $LOCAL_IMAGE" echo "LOCAL_IMAGE: $LOCAL_IMAGE"
echo "REGISTRY: $REGISTRY" echo "REGISTRY: $REGISTRY"
echo "REMOTE_IMAGE: $REMOTE_IMAGE" echo "REMOTE_IMAGE: $REMOTE_IMAGE"
docker buildx build --platform linux/amd64,linux/arm64 -f $DOCKERFILE -t \ #docker buildx build --platform linux/amd64,linux/arm64 -f ${DOCKERFILE} -t \
$REGISTRY/$REMOTE_IMAGE:$TAG . --push # ${REGISTRY}/${REMOTE_IMAGE}:${TAG} . --push
docker buildx build --platform linux/amd64 -f ${DOCKERFILE} \
-t ${REGISTRY}/${REMOTE_IMAGE}:${TAG} \
-t ${REGISTRY}/${REMOTE_IMAGE}:latest . --push