Compare commits
5 Commits
833e6f2d3b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 69e16471d7 | |||
| a6612f6cdc | |||
| 40fea85a4c | |||
| 4fc2abe49c | |||
| de90c24a78 |
@@ -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
|
||||
|
||||
|
||||
3
Makefile
3
Makefile
@@ -38,3 +38,6 @@ gen-schema-download:
|
||||
|
||||
gen-schema:
|
||||
yarn --cwd s3browser-frontend run graphql:gen
|
||||
|
||||
test-backend:
|
||||
cd s3browser-backend && go test ./...
|
||||
@@ -15,7 +15,6 @@ services:
|
||||
- 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
|
||||
Submodule s3browser-backend updated: c5ab0156fd...125ce9c955
Submodule s3browser-frontend updated: 9462a74437...1d2f25ef04
Reference in New Issue
Block a user