chore: rearranged docker contents

docker/alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine3.20 AS builder
 
 ADD . /root/wingmate
 WORKDIR /root/wingmate/
@@ -9,7 +9,7 @@ RUN apk update && apk add git make build-base && \
 
 
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN apk add tzdata && ln -s /usr/share/zoneinfo/Australia/Sydney /etc/localtime && \
     adduser -h /home/user1 -D -s /bin/sh user1 && \

docker/bookworm-newconfig/Dockerfile

@@ -1,20 +0,0 @@
-FROM golang:1.22-bookworm as builder
-
-ADD . /root/wingmate
-WORKDIR /root/wingmate/
-ARG TEST_BUILD
-RUN make all && make DESTDIR=/usr/local/bin/wingmate install
-
-
-
-FROM debian:bookworm
-
-RUN ln -sf /usr/share/zoneinfo/Australia/Sydney /etc/localtime && \
-    apt update && apt install -y procps && \
-    useradd -m -s /bin/bash user1
-COPY --from=builder /usr/local/bin/wingmate/ /usr/local/bin/
-ADD --chmod=755 docker/bookworm-newconfig/entry.sh /usr/local/bin/entry.sh
-ADD --chmod=755 docker/bookworm-newconfig/etc /etc
-
-ENTRYPOINT [ "/usr/local/bin/entry.sh" ]
-CMD [ "/usr/local/bin/wingmate" ]

docker/bookworm-newconfig/entry.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-if [ $# -gt 0 ]; then
-    exec "$@"
-else
-    exec /usr/local/bin/wingmate
-fi

docker/bookworm/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-bookworm as builder
+FROM golang:1.22-bookworm as builder
 
 ADD . /root/wingmate
 WORKDIR /root/wingmate/
@@ -13,8 +13,8 @@ RUN ln -sf /usr/share/zoneinfo/Australia/Sydney /etc/localtime && \
     apt update && apt install -y procps && \
     useradd -m -s /bin/bash user1
 COPY --from=builder /usr/local/bin/wingmate/ /usr/local/bin/
-ADD --chmod=755 docker/bookworm/entry.sh /usr/local/bin/entry.sh
+ADD --chmod=755 docker/bookworm-newconfig/entry.sh /usr/local/bin/entry.sh
-ADD --chmod=755 docker/bookworm/etc /etc
+ADD --chmod=755 docker/bookworm-newconfig/etc /etc
 
 ENTRYPOINT [ "/usr/local/bin/entry.sh" ]
 CMD [ "/usr/local/bin/wingmate" ]

docker/bookworm/etc/wingmate/crontab

@@ -1,3 +0,0 @@
-*/5 * * * * /etc/wingmate/crontab.d/cron1.sh
-17,42 */2 * * * /etc/wingmate/crontab.d/cron2.sh
-7,19,23,47 22 * * * /etc/wingmate/crontab.d/cron3.sh

docker/bookworm/etc/wingmate/crontab.d/cron1.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron1.log
-export WINGMATE_LOG_MESSAGE="cron executed in minute 5,10,15,20,25,30,35,40,45,50,55"
-
-echo "I'm runnig with dummy=$WINGMATE_DUMMY_PATH, log=$WINGMATE_LOG and mesage=$WINGMATE_LOG_MESSAGE" >> /var/log/debug-cron.log
-
-exec /usr/local/bin/wmoneshot

docker/bookworm/etc/wingmate/crontab.d/cron2.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron2.log
-export WINGMATE_LOG_MESSAGE="cron scheduled using 17,42 */2 * * *"
-
-exec /usr/local/bin/wmoneshot

docker/bookworm/etc/wingmate/crontab.d/cron3.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron3.log
-export WINGMATE_LOG_MESSAGE="cron entry: 7,19,23,47 22 * * * /etc/wingmate/crontab.d/cron3.sh"
-
-exec /usr/local/bin/wmoneshot

docker/bookworm/etc/wingmate/service/one.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/bash
-
-export DUMMY_PATH=/usr/local/bin/wmdummy
-exec /usr/local/bin/wmexec --setsid --user user1:user1 -- /usr/local/bin/wmstarter

docker/bookworm/etc/wingmate/service/spawner.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_ONESHOT_PATH=/usr/local/bin/wmoneshot
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-exec /usr/local/bin/wmexec --user 1200 -- /usr/local/bin/wmspawner