bump

.vscode/launch.json

@@ -0,0 +1,32 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug backend",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/s3browser-backend/cmd/s3Browser.go",
+            "envFile": "${workspaceFolder}/s3browser-backend/.env",
+        },
+        {
+            "type": "firefox",
+            "request": "launch",
+            "reAttach": true,
+            "name": "Launch Firefox",
+            "url": "http://localhost:3000/",
+            "webRoot": "${workspaceFolder}/s3browser-frontend"
+        },
+        {
+            "name": "Launch Chromium",
+            "request": "launch",
+            "type": "pwa-chrome",
+            "url": "http://localhost:3000",
+            "webRoot": "${workspaceFolder}/s3browser-frontend",
+            "runtimeExecutable": "/bin/chromium"
+        }
+    ]
+}

Dockerfile

@@ -10,7 +10,7 @@ FROM golang as gobuild
 ADD . /s3browser
 WORKDIR /s3browser
 
-COPY --from=jsbuild /s3browser/s3browser-frontend/build /s3browser/s3browser-backend/internal/static
+COPY --from=jsbuild /s3browser/s3browser-frontend/build/ /s3browser/s3browser-backend/internal/httpserver/static
 
 RUN make build-backend
 

Makefile

@@ -28,7 +28,7 @@ deps-go:
 	cd s3browser-backend && go mod download
 
 dev-backend:
-	cd s3browser-backend && go run ./cmd/s3Browser.go
+	cd s3browser-backend && env $$(grep -v '^#' .env | xargs) go run ./cmd/s3Browser.go
 
 dev-web:
 	yarn --cwd s3browser-frontend run start
@@ -38,3 +38,6 @@ gen-schema-download:
 
 gen-schema:
 	yarn --cwd s3browser-frontend run graphql:gen
+
+test-backend:
+	cd s3browser-backend && go test ./...

docker-compose.yml

@@ -9,13 +9,12 @@ services:
       - S3_ENDPOINT=s3:9000
       - S3_ACCESS_KEY=testo
       - S3_SECRET_KEY=testotesto
-      - S3_BUKET=dev
       - S3_DISABLE_SSL=true
       - ADDRESS=:3000
       - VERBOSE=false
+      - DB_CONNECTION=s3Browser:hunter2@/s3Browser
     restart: unless-stopped
   s3:
-    container_name: s3
     image: minio/minio
     environment:
       - MINIO_ROOT_USER=admin
@@ -26,6 +25,19 @@ services:
     command: server /data --console-address ":9001"
     volumes:
     - s3_dev:/data
+  db:
+    image: mariadb
+    environment:
+      - MARIADB_ROOT_PASSWORD=hunter2
+      - MARIADB_DATABASE=s3Browser
+      - MARIADB_USER=s3Browser
+      - MARIADB_PASSWORD=hunter2
+    ports:
+      - 3306:3306
+    volumes:
+      - mariadb_dev:/var/lib/mysql
 volumes: 
   s3_dev:
-    name: s3_dev
+    name: s3_dev
+  mariadb_dev:
+    name: mariadb_dev