From 66637892c95328b0257082fffab25817d8313b6a Mon Sep 17 00:00:00 2001 From: bjoernellens1 <64093272+bjoernellens1@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:40:14 +0100 Subject: [PATCH] update --- docker-compose.yaml | 46 ++++++++++++++++++++++----------------------- docker/Dockerfile | 14 +++++++------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5fe59ab..fedefe0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -133,29 +133,29 @@ services: devices: - /dev/dri:/dev/dri - config: - container_name: olivetin - image: ghcr.io/bjoernellens1/cps_bot_mini_ws/olivetin - build: - context: . - dockerfile: docker/Dockerfile - tags: - - ghcr.io/bjoernellens1/cps_bot_mini_ws/olivetin - target: olivetin - x-bake: - platforms: - #- linux/arm64 - - linux/amd64 - #user: root - privileged: true - volumes: - - ./config/olivetin.yaml:/config/config.yaml # replace host path or volume as needed - - .:/repo - - /var/run/docker.sock:/var/run/docker.sock - - /var/lib/docker:/var/lib/docker - ports: - - "88:1337" - restart: unless-stopped + # config: + # container_name: olivetin + # image: ghcr.io/bjoernellens1/cps_bot_mini_ws/olivetin + # build: + # context: . + # dockerfile: docker/Dockerfile + # tags: + # - ghcr.io/bjoernellens1/cps_bot_mini_ws/olivetin + # target: olivetin + # x-bake: + # platforms: + # #- linux/arm64 + # - linux/amd64 + # #user: root + # privileged: true + # volumes: + # - ./config/olivetin.yaml:/config/config.yaml # replace host path or volume as needed + # - .:/repo + # - /var/run/docker.sock:/var/run/docker.sock + # - /var/lib/docker:/var/lib/docker + # ports: + # - "88:1337" + # restart: unless-stopped ################################################################################################################################ # This section is mostly for supervision from PC # diff --git a/docker/Dockerfile b/docker/Dockerfile index a765205..97131ed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -121,15 +121,15 @@ LABEL org.opencontainers.image.source=https://github.com/bjoernellens1/cps_loki # ENTRYPOINT [ "/usr/bin/OliveTin" ] -FROM alpine AS olivetin +# FROM alpine AS olivetin -RUN wget https://github.com/OliveTin/OliveTin/releases/latest/download/OliveTin_linux_amd64.apk -RUN apk add --allow-untrusted OliveTin_linux_amd64.apk docker-cli-compose +# RUN wget https://github.com/OliveTin/OliveTin/releases/latest/download/OliveTin_linux_amd64.apk +# RUN apk add --allow-untrusted OliveTin_linux_amd64.apk docker-cli-compose -# Expose the default OliveTin port -EXPOSE 1337 +# # Expose the default OliveTin port +# EXPOSE 1337 -# Set the default command to run OliveTin -CMD ["OliveTin"] \ No newline at end of file +# # Set the default command to run OliveTin +# CMD ["OliveTin"] \ No newline at end of file