Merge branch 'main' of https://git.n8x.sx/chiko/77th_eventcalenderntfy

Dockerfile

@@ -4,6 +4,7 @@ ARG VERSION
 LABEL build_version="77th_eventcalendarntfy ${VERSION}, Build-date:- ${BUILD_DATE}"
 LABEL maintainer="chiko <chiko@xcsone.de>"
 WORKDIR /opt/app
+<<<<<<< HEAD
 RUN set -eux && \
     echo "Updating APT" && \
         apt-get update -y -qq && \
@@ -19,6 +20,12 @@ RUN set -eux && \
         rm --recursive --force --verbose /var/tmp/* && \
         rm --recursive --force --verbose /var/cache/apt/archives/* && \
         truncate --size 0 /var/log/*log
+=======
+RUN apt-get update && \
+    # apt-get install -y curl unzip cron ca-certificates python3 python3-pip && \
+    apt-get install -y curl unzip cron ca-certificates python3 python3-pip && \
+    rm -rf /var/lib/apt/lists/*
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
 # install BunJs
 RUN curl -fsSL https://bun.com/install | bash
 ENV PATH="/root/.bun/bin:$PATH"
@@ -34,26 +41,49 @@ RUN mkdir -p /temp/prod
 COPY package.json bun.lock /temp/prod/
 RUN cd /temp/prod && bun install --frozen-lockfile --production
 
+<<<<<<< HEAD
 COPY ./docker/Crontab /etc/cron.d/
 RUN chmod 0644 /etc/cron.d/Crontab
 COPY ./docker/cron-bun-log /etc/logrotate.d/
 RUN mkdir /var/log/cron && touch /var/log/cron.log
+=======
+# and install python dependencies
+# COPY ./requirements.txt .
+# RUN python3 -m pip install --break-system-packages -r requirements.txt
+# RUN python3 -m pip install -U python-dotenv
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
 
 # copy node_modules from temp directory
 # then copy all (non-ignored) project files into the image
 FROM base AS prerelease
 COPY --from=install /temp/dev/node_modules node_modules
 COPY . ./
+<<<<<<< HEAD
+=======
+
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
 # [optional] tests & build
 ENV NODE_ENV=production
 
 # copy production dependencies and source code into final image
 FROM base AS release
+WORKDIR /opt/app
 COPY --from=install /temp/prod/node_modules node_modules
 COPY --from=prerelease /opt/app/package.json .
 #COPY --from=prerelease .entrypoint.sh .
+<<<<<<< HEAD
 COPY . ./
 RUN mkdir /var/log/cron && touch /var/log/cron.log
 VOLUME /opt/app/data/db
 # VOLUME /var/log/cron
+=======
+COPY Crontab /etc/cron.d/
+RUN chmod 0644 /etc/cron.d/Crontab
+COPY . ./
+# USER bun
+RUN touch /var/log/cron.log
+# RUN chmod +x entrypoint.sh
+# ENTRYPOINT ["./entrypoint.sh"]
+VOLUME /opt/app/data/db
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
 CMD bun run ./src/app.ts --today && cron && tail -f /var/log/cron.log