fix(fileimport service): s3 is not required by fileimport service (#924)
Fileimport service retreives blobs via the server storage API, and not directly from s3. Fileimport service no longer requires information or credentials about s3.
This commit is contained in:
@@ -73,11 +73,4 @@ services:
|
||||
environment:
|
||||
DEBUG: 'fileimport-service:*'
|
||||
PG_CONNECTION_STRING: 'postgres://speckle:speckle@postgres/speckle'
|
||||
|
||||
S3_ENDPOINT: 'http://minio:9000'
|
||||
S3_ACCESS_KEY: 'minioadmin'
|
||||
S3_SECRET_KEY: 'minioadmin'
|
||||
S3_BUCKET: 'speckle-server'
|
||||
S3_REGION: '' # optional, defaults to 'us-east-1'
|
||||
|
||||
SPECKLE_SERVER_URL: 'http://speckle-server:3000'
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
"node": "^16.0.0"
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "cross-env S3_BUCKET=speckle-server POSTGRES_URL=postgres://speckle:speckle@localhost/speckle NODE_ENV=development SPECKLE_SERVER_URL=http://localhost:3000 nodemon ./src/daemon.js",
|
||||
"dev": "cross-env POSTGRES_URL=postgres://speckle:speckle@localhost/speckle NODE_ENV=development SPECKLE_SERVER_URL=http://localhost:3000 nodemon ./src/daemon.js",
|
||||
"parse:ifc": "node ./ifc/import_file.js /tmp/file_to_import/file 33763848d6 2e4bfb467a main File upload: steelplates.ifc",
|
||||
"lint": "eslint . --ext .js,.ts"
|
||||
},
|
||||
|
||||
@@ -111,12 +111,5 @@ services:
|
||||
environment:
|
||||
DEBUG: 'fileimport-service:*'
|
||||
PG_CONNECTION_STRING: 'postgres://speckle:speckle@postgres/speckle'
|
||||
WAIT_HOSTS: 'postgres:5432, minio:9000'
|
||||
|
||||
S3_ENDPOINT: 'http://minio:9000'
|
||||
S3_ACCESS_KEY: 'minioadmin'
|
||||
S3_SECRET_KEY: 'minioadmin'
|
||||
S3_BUCKET: 'speckle-server'
|
||||
S3_REGION: '' # optional, defaults to 'us-east-1'
|
||||
|
||||
WAIT_HOSTS: 'postgres:5432'
|
||||
SPECKLE_SERVER_URL: 'http://speckle-server:3000'
|
||||
|
||||
@@ -80,21 +80,6 @@ spec:
|
||||
value: "/postgres-certificate/ca-certificate.crt"
|
||||
{{- end }}
|
||||
|
||||
|
||||
- name: S3_ENDPOINT
|
||||
value: {{ .Values.s3.endpoint }}
|
||||
- name: S3_ACCESS_KEY
|
||||
value: {{ .Values.s3.access_key }}
|
||||
- name: S3_BUCKET
|
||||
value: {{ .Values.s3.bucket }}
|
||||
- name: S3_SECRET_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .Values.secretName }}
|
||||
key: s3_secret_key
|
||||
- name: S3_REGION
|
||||
value: "{{ .Values.s3.region }}"
|
||||
|
||||
- name: FILE_IMPORT_TIME_LIMIT_MIN
|
||||
value: {{ .Values.fileimport_service.time_limit_min | quote }}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user