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

Tweak gitpod coverstore env file to support older docker versions #9876

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Tweak gitpod coverstore env file to support older docker versions #9876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions .gitpod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ tasks:
sudo chmod g+w -R $GITPOD_REPO_ROOT
# because: https://github.com/gitpod-io/gitpod/issues/9311
chmod o+rx $GITPOD_REPO_ROOT
# set coverstore url
mkdir -p env
echo "OL_COVERSTORE_PUBLIC_URL=https://7075-${GITPOD_WORKSPACE_ID}.${GITPOD_WORKSPACE_CLUSTER_HOST}" > env/web.env
# init runs once for each commit to the default branch
init: docker compose up --no-start && gp sync-done docker-up
# command runs each time a user starts their workspace
command: docker compose up
command: |
export OL_COVERSTORE_PUBLIC_URL="https://7075-${GITPOD_WORKSPACE_ID}.${GITPOD_WORKSPACE_CLUSTER_HOST}"
docker compose up
- name: dev shell
# init runs once for each commit to the default branch
init: ./scripts/setup_gitpod.sh
Expand Down
4 changes: 1 addition & 3 deletions compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ services:
environment:
- OL_CONFIG=${OL_CONFIG:-/openlibrary/conf/openlibrary.yml}
- GUNICORN_OPTS=${GUNICORN_OPTS:- --reload --workers 4 --timeout 180}
- OL_COVERSTORE_PUBLIC_URL=${OL_COVERSTORE_PUBLIC_URL:-}
command: docker/ol-web-start.sh
env_file:
- path: "env/web.env"
required: false
ports:
- ${WEB_PORT:-8080}:8080
networks:
Expand Down
Loading