Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configure s3 in the containerized environment for file upload e2e tests #457

Merged
merged 10 commits into from
Aug 21, 2024
Merged

Configure s3 in the containerized environment for file upload e2e tests #457

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9cfffff
Added: localstack container and related config to environment
GPortas Aug 13, 2024
9a34e29
Added: CORS config to localstack container
GPortas Aug 14, 2024
5ab638c
Fixed: localstack container visibility issue from outside containeriz…
GPortas Aug 15, 2024
650cbcf
Changed: use remote s3 aws storage instead of containerized
GPortas Aug 15, 2024
1f29b7c
Added: action npmrc setup and cleanup
GPortas Aug 15, 2024
030b8f4
Fixed: action step
GPortas Aug 15, 2024
429c39a
Fixed: test action steps
GPortas Aug 15, 2024
5abff2b
Changed: s3 as default storage option
GPortas Aug 16, 2024
dd60f36
Merge branch 'develop' of github.com:IQSS/dataverse-frontend into 456…
GPortas Aug 21, 2024
0ca4a1f
fix: missing type prop on LinkToPage
g-saracca Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ jobs:
echo VITE_DATAVERSE_BACKEND_URL="$DATAVERSE_BACKEND_URL" >> .env
shell: bash

- name: Create containerized development environment .env file
working-directory: dev-env
run: cp .env.example .env
shell: bash

- name: Set S3 secrets for the containerized development environment
working-directory: dev-env
run: |
sed -i -e 's/<S3_ACCESS_KEY>/${{ secrets.S3_ACCESS_KEY }}/g' .env
sed -i -e 's/<S3_SECRET_KEY>/${{ secrets.S3_SECRET_KEY }}/g' .env
shell: bash

- name: Update registry for the containerized development environment
working-directory: dev-env
run: |
Expand Down
2 changes: 2 additions & 0 deletions dev-env/.env → dev-env/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ POSTGRES_VERSION=13
DATAVERSE_DB_USER=dataverse
SOLR_VERSION=9.3.0
REGISTRY=docker.io
S3_ACCESS_KEY=<S3_ACCESS_KEY>
S3_SECRET_KEY=<S3_SECRET_KEY>
1 change: 1 addition & 0 deletions dev-env/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.env
13 changes: 13 additions & 0 deletions dev-env/docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ services:
-Ddataverse.pid.fake.label=FakeDOIProvider
-Ddataverse.pid.fake.authority=10.5072
-Ddataverse.pid.fake.shoulder=FK2/
-Ddataverse.files.s3.access-key=${S3_ACCESS_KEY}
-Ddataverse.files.s3.label=s3
-Ddataverse.files.s3.secret-key=${S3_SECRET_KEY}
-Ddataverse.files.storage-driver-id=s3
-Ddataverse.files.s3.type=s3
-Ddataverse.files.s3.bucket-name=beta-dataverse-direct
-Ddataverse.files.s3.upload-redirect=true
-Ddataverse.files.s3.download-redirect=true
-Ddataverse.files.s3.ingestsizelimit=50000000
-Ddataverse.files.s3.url-expiration-minutes=60
-Ddataverse.files.s3.connection-pool-size=2048
-Ddataverse.files.s3.custom-endpoint-region=us-east-1
-Ddataverse.files.s3.custom-endpoint-url=https://s3.us-east-1.amazonaws.com
expose:
- '8080'
networks:
Expand Down
Loading