-
Notifications
You must be signed in to change notification settings - Fork 531
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tmp:fix cache key uniqueness Make actual package.json available in image TMP: log errors in cache. TMP: remove volumes from base Split mount data olympi Add compose file var Use digest instead of version Better usage of cache action TMP: fixy Add base shell possibility Log contents of site-static
- Loading branch information
Showing
18 changed files
with
259 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| name: 'Restore ./deps cache' | ||
| description: 'Tries to restore ./deps from cache, installing fresh if missing' | ||
| runs: | ||
| using: 'composite' | ||
| steps: | ||
| - name: Keys | ||
| id: keys | ||
| shell: bash | ||
| run: | | ||
| echo "key=deps_cache-${{ runner.os }}-${{ github.run_id }}" >> $GITHUB_OUTPUT | ||
| echo "pip=pip-${{ hashFiles('requirements/**') }}" >> $GITHUB_OUTPUT | ||
| echo "node=node-${{ hashFiles('package*.json') }}" >> $GITHUB_OUTPUT | ||
| echo "path=${{ github.workspace }}/deps" >> $GITHUB_OUTPUT | ||
| - name: Restore | ||
| uses: actions/cache/restore@v3 | ||
| id: cache | ||
| with: | ||
| path: ${{ steps.keys.outputs.path }} | ||
| key: ${{ steps.keys.outputs.key }} | ||
| restore-keys: | | ||
| ${{ steps.keys.outputs.pip }} | ||
| ${{ steps.keys.outputs.node }} | ||
| - name: Install | ||
| shell: bash | ||
| env: | ||
| DOCKER_SERVICES: web | ||
| COMPOSE_FILE: docker-compose.yml | ||
| run: | | ||
| make up | ||
| - name: Save | ||
| if: always() | ||
| uses: actions/cache/save@v3 | ||
| with: | ||
| path: ${{ steps.keys.outputs.path }} | ||
| key: ${{ steps.keys.outputs.key }} | ||
|
|
||
| - name: Logs | ||
| shell: bash | ||
| if: always() | ||
| run: docker compose logs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,9 +37,6 @@ runs: | |
| exit 1 | ||
| fi | ||
| # Setup host | ||
| make setup | ||
| # Start the specified services | ||
| make up | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| networks: | ||
| default: | ||
|
|
||
| volumes: | ||
| deps: | ||
| driver: local | ||
| driver_opts: | ||
| type: none | ||
| o: bind | ||
| device: ${PWD}/deps | ||
| data_redis: | ||
| data_elasticsearch: | ||
| data_mysqld: | ||
| # Keep this value in sync with Makefile-os | ||
| # External volumes must be manually created/destroyed | ||
| name: addons-server_data_mysqld | ||
| external: true | ||
| data_rabbitmq: | ||
| storage: | ||
| driver: local | ||
| driver_opts: | ||
| type: none | ||
| o: bind | ||
| device: ${PWD}/storage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| services: | ||
| # Temporary container to update the dependencies in the deps volume | ||
| # before running the web/worker containers. | ||
| deps_container: | ||
| extends: | ||
| file: docker-compose._olympia.yml | ||
| service: olympia | ||
| # We have to run as olympia to ensure deps has the correct permissions. | ||
| entrypoint: ["/bin/sh", "-c"] | ||
| user: olympia | ||
| command: | ||
| - | | ||
| whoami | ||
| cp /data/olympia/package.json /data/olympia/package-lock.json /deps | ||
| ls -lan /deps | ||
| make update_deps | ||
| ls -lan /deps |
Oops, something went wrong.