Merge branch '14-fix-docker-image' into 'master' (8cc8d675) · Commits · open-source / Proxy · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Proxy
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

8cc8d675

Commit 8cc8d675 authored 5 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '14-fix-docker-image' into 'master'

Resolve "fix docker image"

Closes #14

See merge request !16

parents c98e5980 763f6d7f

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 2 deletions

.gitlab-ci.yml
Dockerfile 61 additions, 3 deletions

Dockerfile
DockerfileDev 52 additions, 0 deletions

DockerfileDev
chart/templates/deployment.yaml 48 additions, 45 deletions

chart/templates/deployment.yaml
config/nginx-default.conf 54 additions, 0 deletions

config/nginx-default.conf
config/nginx.conf 32 additions, 0 deletions

config/nginx.conf
docker-compose.yml 17 additions, 3 deletions

docker-compose.yml

with 265 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment