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.

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

PPF-198 Add Docker setup #165

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e0d0dc0
Add Docker file for Ubuntu with Node
LucWollants Nov 21, 2023
b11fa28
Add start command for Docker on host 0.0.0.0
LucWollants Nov 21, 2023
b6fb65c
Add docker-compose file
LucWollants Nov 21, 2023
a5b0e40
Add Makefile
LucWollants Nov 21, 2023
f109a0b
Added Jira link to GitHub pull request template
LucWollants Nov 21, 2023
52a59e0
Linting
LucWollants Nov 21, 2023
f307333
Ignore docker-compose.yml file for Prettier
LucWollants Nov 21, 2023
4ae708d
Linting
LucWollants Nov 21, 2023
4c78d45
Move npm -i out of Dockerfile & into Makefile
JonasVHG Nov 22, 2023
99c8e1d
update config
JonasVHG Nov 29, 2023
4c7f567
Add new values to environment
JonasVHG Nov 29, 2023
58ef77f
Add translation
JonasVHG Nov 29, 2023
92b9add
update name & redirect of BackButton depending on platformIsLive
JonasVHG Nov 29, 2023
aff2e68
linting
JonasVHG Nov 29, 2023
339dddb
Consistent naming `publiq platform`
LucWollants Dec 11, 2023
d790534
Redirect to integrations page for normal users
LucWollants Dec 11, 2023
31f0c69
Merge pull request #167 from cultuurnet/PPF-237-widgets-redirect
LucWollants Dec 11, 2023
acba8dd
Merge branch 'master' into PPF-198-docker-setup
brampauwelyn Dec 14, 2023
5433d04
Merge branch 'PPF-237-redirect-to-public-platform' into PPF-198-docke…
LucWollants Dec 19, 2023
10c03cc
Merge branch 'master' into PPF-198-docker-setup
LucWollants Dec 19, 2023
92fedb1
Update from main
brampauwelyn Jan 10, 2024
6178f11
PPF-198 - Add instructions for docker setup
brampauwelyn May 27, 2024
b404530
merge master
JonasVHG Nov 4, 2024
8f3b8e6
merge master
JonasVHG Nov 4, 2024
c1d6a79
merge master
JonasVHG Nov 4, 2024
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
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

---

Ticket:
Ticket: https://jira.publiq.be/browse/
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.PHONY: up down bash install serve

up:
docker-compose up -d

down:
docker-compose down

bash:
docker-compose exec node bash

install:
docker-compose exec -d node npm i --force

16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,19 @@ Run `ng build` to build the project. The build artifacts will be stored in the `
## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).



# Docker setup

Start docker container
`make up`

Install dependencies
`make install`

Bash in the container
`make bash`

Serve widgetbeheer
`npm run start:docker`
18 changes: 18 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: '3.5'

services:
node:
build: docker/node
hostname: 'widget-beheer.local'
volumes:
- .:/var/www/html:cached
working_dir: /var/www/html
container_name: node.widgetbeheer
ports:
- '4200:4200'
networks:
- widgetbeheer

networks:
widgetbeheer:
driver: bridge
15 changes: 15 additions & 0 deletions docker/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:20.04

RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl gnupg vim libffi-dev git

RUN mkdir -p /etc/apt/keyrings

RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg

RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list

RUN apt-get update && apt-get install -y --no-install-recommends nodejs

RUN npm install -g @angular/cli

ENTRYPOINT ["tail", "-f", "/dev/null"]
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"start:docker": "ng serve --host 0.0.0.0 --disable-host-check",
"build": "ng build",
"types:check": "tsc --noEmit",
"format": "prettier . --write --ignore-path .gitignore",
Expand Down
Loading
Loading