diff --git a/Dockerfile b/Dockerfile index 038e66b..b094c3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 -FROM dioxus as builder +FROM dioxus AS builder 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 COPY ./src/ ./src/ COPY ./assets/ ./assets/ @@ -13,7 +13,7 @@ COPY ./Dioxus.toml ./Dioxus.toml COPY ./tailwind.config.js ./tailwind.config.js 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/ COPY --from=builder /athome/docs/ ./docs/ CMD [ "./docs/athome" ] diff --git a/scripts/docker-push.sh b/scripts/docker-push.sh index dbf3a6a..e28b919 100755 --- a/scripts/docker-push.sh +++ b/scripts/docker-push.sh @@ -1,16 +1,20 @@ #!/bin/sh -VERSION=$(git branch | grep "*" | awk '{ print $2 }') +TAG=$(git branch | grep "*" | awk '{ print $2 }') LOCAL_IMAGE="athome" REGISTRY="mos4" REMOTE_IMAGE="athome" DOCKERFILE="./Dockerfile" echo "DOCKERFILE: $DOCKERFILE" -echo "VERSION: $VERSION" +echo "TAG: $TAG" echo "LOCAL_IMAGE: $LOCAL_IMAGE" echo "REGISTRY: $REGISTRY" echo "REMOTE_IMAGE: $REMOTE_IMAGE" -docker buildx build --platform linux/amd64,linux/arm64 -f $DOCKERFILE -t \ - $REGISTRY/$REMOTE_IMAGE:$TAG . --push +#docker buildx build --platform linux/amd64,linux/arm64 -f ${DOCKERFILE} -t \ +# ${REGISTRY}/${REMOTE_IMAGE}:${TAG} . --push + +docker buildx build --platform linux/amd64 -f ${DOCKERFILE} \ + -t ${REGISTRY}/${REMOTE_IMAGE}:${TAG} \ + -t ${REGISTRY}/${REMOTE_IMAGE}:latest . --push