Skip to content

Commit

Permalink
877 fix local build: npm certificate, docker-compose platform (#878)
Browse files Browse the repository at this point in the history
* update node version and rebuild package-lock.json

* use exact version numbers in package.json

* rebuild package-lock.json

* fix vue/cli dependency

* use linux/amd64 platform

* add instructions to README-DEVELOPMENT.md

* fix README-DEVELOPMENT.md instructions, add comments to docker compose files.

* Update npm packages

* rollback vue package versions

* updates for minor docker related changes

"docker-compose" -> "docker compose"

* try adding platform to fix tests

* (revert)

---------
  • Loading branch information
ekraffmiller authored Aug 1, 2024
1 parent 8aaf6c4 commit 75d931b
Show file tree
Hide file tree
Showing 8 changed files with 13,583 additions and 23,280 deletions.
4 changes: 3 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ export AZURE_LOGGING=False
export AZURE_INSTRUMENTATION_KEY=

export VUE_APP_ADOBE_PDF_CLIENT_ID=
export GITHUB_RUN_ID=$RANDOM

# removing value of $RANDOM b/c of Docker errors and changing to test12345
export GITHUB_RUN_ID=test12345
4 changes: 2 additions & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build the client static files
run: docker-compose -f docker-compose-ci-step1.yml up
run: docker compose -f docker-compose-ci-step1.yml up
- name: Build server and test
run: docker-compose -f docker-compose-ci-step2.yml up --exit-code-from cypress
run: docker compose -f docker-compose-ci-step2.yml up --exit-code-from cypress
- name: Archive Cypress test results
if: ${{ always() }}
uses: actions/upload-artifact@v2
Expand Down
16 changes: 6 additions & 10 deletions README-DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,19 @@ This page lists contains rudimentary instructions for building the development e

If major configuration changes have been made (new dependencies, etc.) then the containers will need to be rebuilt:

`docker-compose up --build`
`docker compose up --build`

1. All subsequent commands should be run from the `server` directory

`cd server`

3. The first time you run (or anytime schema changes have been made), open a separate Terminal, `cd` into the `dpcreator/` directory
and manually run this migration:

`docker-compose run server ./migrate.sh`
__`docker compose run server ./migrate.sh`__

(In general, any command can be run by adding "docker-compose run server" to the beginning,
such as:
4. Open `http://localhost:8000/` in your browser. You should see DP Creator running.
5. You can login to DP Creator using the following credentials:

`docker-compose run server python manage.py shell`

which will drop you into the Django shell on the Docker container.)
- Username: `dev_admin`
- Password: `admin`

## Running without Containers (not recommended)

Expand Down
2 changes: 1 addition & 1 deletion client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.15.0
FROM node:20.11.0

# Create app directory
WORKDIR /code/client
Expand Down
Loading

0 comments on commit 75d931b

Please sign in to comment.