diff --git a/docker-compose-speckle.yml b/docker-compose-speckle.yml index 5f1262bbe..8cbf2aa8a 100644 --- a/docker-compose-speckle.yml +++ b/docker-compose-speckle.yml @@ -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' diff --git a/packages/fileimport-service/package.json b/packages/fileimport-service/package.json index 122f7716d..344638ebd 100644 --- a/packages/fileimport-service/package.json +++ b/packages/fileimport-service/package.json @@ -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" }, diff --git a/utils/1click_image_scripts/template-docker-compose.yml b/utils/1click_image_scripts/template-docker-compose.yml index 0e2529d22..26dc327b9 100644 --- a/utils/1click_image_scripts/template-docker-compose.yml +++ b/utils/1click_image_scripts/template-docker-compose.yml @@ -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' diff --git a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml index e0a20cb6b..744b1b07f 100644 --- a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml +++ b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml @@ -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 }}