Merge pull request #777 from traPtitech/dokka-n

:docker_ga_dokka-n.ex-large:

Dockerfile.dev

@@ -1,5 +1,4 @@
 FROM golang:1.22.3-alpine as build
-ENV DOCKERIZE_VERSION v0.6.1
 ENV CGO_ENABLED 0
 ENV TZ Asia/Tokyo
 
@@ -13,13 +12,11 @@ RUN apk --update --no-cache add tzdata \
 RUN apk --update --no-cache add ca-certificates \
     && update-ca-certificates
 
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-
-RUN go install github.com/air-verse/air@latest
-
 WORKDIR /src
 
 COPY go.mod go.sum ./
 RUN go mod download
+
+COPY . .
+
+CMD [ "go", "run", "main.go" ]

compose.yml

@@ -12,8 +12,6 @@ services:
     build:
       context: ./
       dockerfile: ./Dockerfile.dev
-    entrypoint: dockerize -wait tcp://db:3306 -timeout 60s
-    command: "air -c .air.toml"
     environment:
       MARIADB_USERNAME: root
       MARIADB_PASSWORD: password
@@ -26,13 +24,21 @@ services:
     ports:
       - "1323:1323"
     volumes:
-      - "./:/src"
+      - "./uploads:/src/uploads"
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     tty: true
+    develop:
+      watch:
+        - path: ./
+          action: sync+restart
+          target: /src
+          ignore:
+            - uploads
 
   db:
-    image: mariadb:10.3.29
+    image: mariadb:10.11.4
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: password
@@ -45,6 +51,18 @@ services:
       - "3306"
     ports:
       - "3306:3306"
+    healthcheck:
+      test: [
+        "CMD",
+        "healthcheck.sh",
+        "--su-mysql",
+        "--connect",
+        "--innodb_initialized"
+      ]
+      interval: 10s
+      timeout: 5s
+      start_period: 5s
+      retries: 3
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin