Skip to content

Commit

Permalink
remove s3 logging from docker-compose and update upgrade docs (#4278)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrhizor committed Jun 23, 2021
1 parent 0a4712c commit 38ed70c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
5 changes: 0 additions & 5 deletions .env
Expand Up @@ -36,8 +36,3 @@ TRACKING_STRATEGY=segment
WEBAPP_URL=http://localhost:8000/
API_URL=/api/v1/
INTERNAL_API_HOST=airbyte-server:8001

S3_LOG_BUCKET=
S3_LOG_BUCKET_REGION=
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
8 changes: 0 additions & 8 deletions docker-compose.yaml
Expand Up @@ -57,10 +57,6 @@ services:
- AIRBYTE_VERSION=${VERSION}
- AIRBYTE_ROLE=${AIRBYTE_ROLE:-}
- TEMPORAL_HOST=${TEMPORAL_HOST}
- S3_LOG_BUCKET=${S3_LOG_BUCKET}
- S3_LOG_BUCKET_REGION=${S3_LOG_BUCKET_REGION}
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- workspace:${WORKSPACE_ROOT}
Expand All @@ -85,10 +81,6 @@ services:
- AIRBYTE_VERSION=${VERSION}
- AIRBYTE_ROLE=${AIRBYTE_ROLE:-}
- TEMPORAL_HOST=${TEMPORAL_HOST}
- S3_LOG_BUCKET=${S3_LOG_BUCKET}
- S3_LOG_BUCKET_REGION=${S3_LOG_BUCKET_REGION}
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
ports:
- 8001:8001
volumes:
Expand Down
4 changes: 2 additions & 2 deletions docs/operator-guides/upgrading-airbyte.md
Expand Up @@ -73,9 +73,9 @@ If you inadvertently upgrade to a version of Airbyte that is not compatible with

6. Upgrade the docker instance to new version.

i. If you are running Airbyte from a cloned version of the Airbyte repo and want to use the current most recent stable version, just `git pull`.
i. If you are running Airbyte from a cloned version of the Airbyte GitHub repo and want to use the current most recent stable version, just `git pull`.

ii. If you are running Airbyte from a `.env`, edit the `VERSION` field in that file to be the desired version \(make sure your docker-compose.yaml is mirroring the [latest version](https://github.com/airbytehq/airbyte/tree/4f03fc460350cbf1e8613853ab13fa6db14c0d06/docker-compose.yaml) if you encounter any problems\).
ii. If you are running Airbyte from downloaded `docker-compose.yaml` and `.env` files without a GitHub repo, run `wget -N https://raw.githubusercontent.com/airbytehq/airbyte/master/{.env,docker-compose.yaml}` to pull the latest versions and overwrite both files.

7. Bring Airbyte back online.

Expand Down

0 comments on commit 38ed70c

Please sign in to comment.