Dockerfile

@@ -1,9 +1,9 @@
-FROM rust:1.79.0 AS dioxus
+FROM rust:1.77.2 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 libssl-dev musl-tools -y && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install nodejs npm -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" ]

scripts/docker-push.sh

@@ -1,20 +1,9 @@
 #!/bin/sh
 
-TAG=$(git branch | grep "*" | awk '{ print $2 }')
+VERSION=0.1.2
 LOCAL_IMAGE="athome"
-REGISTRY="mos4"
 REMOTE_IMAGE="athome"
-DOCKERFILE="./Dockerfile"
 
-echo "DOCKERFILE: $DOCKERFILE"
+docker build -t $LOCAL_IMAGE .
-echo "TAG: $TAG"
+docker tag $LOCAL_IMAGE:latest mos4/$REMOTE_IMAGE:$VERSION
-echo "LOCAL_IMAGE: $LOCAL_IMAGE"
+docker push mos4/$REMOTE_IMAGE:$VERSION
-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 -f ${DOCKERFILE} \
-  -t ${REGISTRY}/${REMOTE_IMAGE}:${TAG} \
-  -t ${REGISTRY}/${REMOTE_IMAGE}:latest . --push