Skip to content

Commit

Permalink
A variety of improvements all around (compdemocracy#1608)
Browse files Browse the repository at this point in the history
* remove unused Dockerfile

* placeholder for local dev builds

* docker compose instead of docker-compose

* update Docker and compose files

* gitignore math/.cpcache

* remove unused config vars

* update versions in participation readme

* update all package.json files, replacing ^ with ~; rebuild all package-lock files

* update nvm references; stop using --harmony

* additional comments and a small fix

* keep libpq-dev in the running server container

* remove unused Procfile

* fully remove residual bower references;
remove unused bower-derived fontawesome configuration;
remove unused bower-derived flatui references.

* server node_modules volume for development

* Add POSTRES_PORT option to docker-compose.dev.yml

* remove extraneous run command in docker-compose.dev.yml

---------

Co-authored-by: Christopher Small <[email protected]>
  • Loading branch information
ballPointPenguin and metasoarous authored Jan 28, 2023
1 parent 94c674e commit ad23ff5
Show file tree
Hide file tree
Showing 48 changed files with 14,172 additions and 27,697 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
TAG=dev
COMPOSE_PROJECT_NAME=polis-${TAG}
HTTP_PORT=80

# GIT_HASH will be set properly when running `make` (see Makefile).
GIT_HASH=placeholder
90 changes: 0 additions & 90 deletions Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion Procfile

This file was deleted.

1 change: 0 additions & 1 deletion client-admin/.env_dev

This file was deleted.

3 changes: 1 addition & 2 deletions client-admin/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"search.exclude": {
"**/*.code-search": false,
"**/bower_components": false,
"**/node_modules": false
}
}
}
18 changes: 11 additions & 7 deletions client-admin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
FROM docker.io/node:14.14.0-alpine
# NOTE: This Dockerfile is not actually used by the docker-compose.yml.
# Instead, the file-server Dockerfile builds and serves these assets.
# But this file is still useful for development or deployments that do not use
# the docker compose configuration.

WORKDIR /app
FROM docker.io/node:18-alpine

RUN apk add git --no-cache
WORKDIR /app

COPY package*.json ./
RUN npm install

RUN npm ci

COPY polis.config.template.js polis.config.js
# If polis.config.js exists on host, will override template here.
# If polis.config.js already exists in the local directory being copied,
# it will override the template from the line above.
COPY . .

ARG GIT_HASH
RUN npm run build:prod
CMD npm run build:prod
6 changes: 3 additions & 3 deletions client-admin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Install the NVM following the instructions: [NVM Installation Guide](https://git
Them run the commands below to install the correct Node.JS version and the application dependencies.

```sh
nvm install 14.14.0
nvm install 18
nvm use 18
npm install
```

Expand All @@ -20,14 +21,13 @@ npm install
If you having troubles with npm dependencies try run the commands below:

```sh
npm cache clear
rm -rf node_modules
npm install
```

## Running Application

```sh
nvm use 14.14.0
npm start
```

Expand Down
Loading

0 comments on commit ad23ff5

Please sign in to comment.