From 7eb56999a3184a23a638b29065f64255cc52b948 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Mon, 7 Nov 2022 16:31:19 +0100
Subject: [PATCH] fickit used at FIC

---
 fickit-backend.yml  | 35 ++++++++++++++++++-----------------
 fickit-frontend.yml |  8 ++++++--
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/fickit-backend.yml b/fickit-backend.yml
index 4ec8da66..2f4da891 100644
--- a/fickit-backend.yml
+++ b/fickit-backend.yml
@@ -161,9 +161,10 @@ services:
       mkdir:
         - /var/lib/fic/backups
   - name: fic-admin
-    image: nemunaire/fic-admin:latest
-    command: ["/srv/admin", "-4real", "-bind=127.0.0.1:8081", "-baseurl=/admin/", "-localimport=/mnt/fic", "-timestampCheck=/srv/submissions"]
+    image: nemunaire/fic-admin:latest@sha256:41c6dc331a6fee88611d94ecdbdd7f85d1c0a8f8439cd701ed5cde6e68833899
+    command: ["/srv/admin", "-4real", "-bind=127.0.0.1:8081", "-baseurl=/admin/", "-localimport=/mnt/fic", "-timestampCheck=/srv/submissions", "-git-import-remote=git@gitlab.cri.epita.fr:ing/majeures/srs/fic/2022/challenges.git"]
     env:
+      - PATH=/usr/sbin:/usr/bin:/sbin:/bin
       - MYSQL_HOST=db
       - FICCA_PASS=jee8AhloAith1aesCeQu5ahgIegaeM4K
     binds:
@@ -191,7 +192,7 @@ services:
         - /var/lib/fic/submissions
         - /var/lib/fic/teams
   - name: fic-evdist
-    image: nemunaire/fic-evdist:latest
+    image: nemunaire/fic-evdist:latest@sha256:9db168ebc33c0724e7c04facc6d88977d3b5921418f1830cfc101b49b759bf23
     binds:
       - /etc/hosts:/etc/hosts:ro
       - /var/lib/fic/settings:/srv/SETTINGS
@@ -205,7 +206,7 @@ services:
         - /var/lib/fic/settings
         - /var/lib/fic/settingsdist
   - name: fic-backend
-    image: nemunaire/fic-backend:latest
+    image: nemunaire/fic-backend:latest@sha256:5d3b0a11f1b871fbc7bd3c51b21b26f1d9a72c78c748c1f17e78ffa0effa36d2
     env:
       - MYSQL_HOST=db
     binds:
@@ -223,7 +224,7 @@ services:
         - /var/lib/fic/submissions
         - /var/lib/fic/teams
   - name: fic-dashboard
-    image: nemunaire/fic-dashboard:latest
+    image: nemunaire/fic-dashboard:latest@sha256:d678ecb65d0e2e587d7dc8528c4a5cdb187eb9b556737db29672dd43ae3eb39e
     command: ["/srv/dashboard", "-bind=:8082", "-restrict-to-ips=/srv/DASHBOARD/restricted-ips.json"]
     binds:
       - /etc/hosts:/etc/hosts:ro
@@ -283,18 +284,18 @@ services:
     runtime:
       mkdir:
         - /var/lib/fic/outofsync
-  - name: dhcp-server
-    image: joebiellik/dhcpd
-    binds:
-      - /etc/dhcp/dhcpd.conf:/etc/dhcp/dhcpd.conf:ro
-    capabilities:
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-     - CAP_DAC_OVERRIDE
-    net: /run/netns/fic-admin
-    pid: new
-    ipc: new
-    uts: new
+#  - name: dhcp-server
+#    image: joebiellik/dhcpd
+#    binds:
+#      - /etc/dhcp/dhcpd.conf:/etc/dhcp/dhcpd.conf:ro
+#    capabilities:
+#     - CAP_NET_BIND_SERVICE
+#     - CAP_NET_RAW
+#     - CAP_DAC_OVERRIDE
+#    net: /run/netns/fic-admin
+#    pid: new
+#    ipc: new
+#    uts: new
 
 files:
   - path: etc/init.d/001-hostname
diff --git a/fickit-frontend.yml b/fickit-frontend.yml
index b32a16b8..111c2ae7 100644
--- a/fickit-frontend.yml
+++ b/fickit-frontend.yml
@@ -11,7 +11,7 @@ init:
   - linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
   - nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
   - nemunaire/kexec:db743618d3674729088d64b5d303e4b7d7ff148b
-  - nemunaire/fic-frontend-ui:latest
+  - nemunaire/fic-frontend-ui:latest@sha256:027da8fdea78106bee6be87fc1b0874504f8b4092593e874ca767bcc47c79ddc
 
 onboot:
   - name: mod
@@ -173,7 +173,7 @@ services:
         - /var/lib/fic/settingsdist
         - /var/lib/fic/teams
   - name: fic-frontend
-    image: nemunaire/fic-frontend:latest
+    image: nemunaire/fic-frontend:latest@sha256:cf83f1d46678291eda02c9362eb9897bae3156e5c302ae79b1910c25e2b611bf
     command: ["/srv/frontend", "-bind=:8080", "-startedFile=/srv/startingblock/started"]
     binds:
       - /etc/hosts:/etc/hosts:ro
@@ -199,6 +199,10 @@ services:
     binds:
       - /etc/hosts:/etc/hosts:ro
       - /var/lib/fic/teams:/srv/TEAMS:ro
+      - /var/lib/fic/remote:/srv/REMOTE
+    runtime:
+      mkdir:
+        - /var/lib/fic/remote
     net: /run/netns/nginx
   - name: sshd
     image: nemunaire/rsync:5d1f678641de2197041f4bc4c745e7748bedab02