Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Helios Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Helios Server
Commits
6fa12939
Commit
6fa12939
authored
1 year ago
by
jan.bednarik
Browse files
Options
Downloads
Patches
Plain Diff
Remove nginx from deployment
parent
54e94f9e
No related branches found
No related tags found
2 merge requests
!30
Release
,
!29
Api
Pipeline
#15031
passed
1 year ago
Stage: build
Changes
3
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+0
-9
0 additions, 9 deletions
.gitlab-ci.yml
Dockerfile.nginx
+0
-3
0 additions, 3 deletions
Dockerfile.nginx
nginx.conf
+0
-23
0 additions, 23 deletions
nginx.conf
with
0 additions
and
35 deletions
.gitlab-ci.yml
+
0
−
9
View file @
6fa12939
...
@@ -6,7 +6,6 @@ image: docker:20.10.8
...
@@ -6,7 +6,6 @@ image: docker:20.10.8
variables
:
variables
:
DOCKER_TLS_CERTDIR
:
"
/certs"
DOCKER_TLS_CERTDIR
:
"
/certs"
IMAGE_TAG_APP
:
$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
IMAGE_TAG_APP
:
$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
IMAGE_TAG_NGINX
:
$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-nginx
services
:
services
:
-
docker:20.10.8-dind
-
docker:20.10.8-dind
...
@@ -20,11 +19,3 @@ build_app:
...
@@ -20,11 +19,3 @@ build_app:
-
docker pull $CI_REGISTRY_IMAGE:test ||
true
-
docker pull $CI_REGISTRY_IMAGE:test ||
true
-
docker build --cache-from $CI_REGISTRY_IMAGE:test -t $IMAGE_TAG_APP .
-
docker build --cache-from $CI_REGISTRY_IMAGE:test -t $IMAGE_TAG_APP .
-
docker push $IMAGE_TAG_APP
-
docker push $IMAGE_TAG_APP
build_nginx
:
stage
:
build
when
:
manual
script
:
-
docker pull $CI_REGISTRY_IMAGE:test-nginx ||
true
-
docker build --cache-from $CI_REGISTRY_IMAGE:test-nginx -t $IMAGE_TAG_NGINX . -f Dockerfile.nginx
-
docker push $IMAGE_TAG_NGINX
This diff is collapsed.
Click to expand it.
Dockerfile.nginx
deleted
100644 → 0
+
0
−
3
View file @
54e94f9e
FROM nginx:1.18
EXPOSE 8080
ADD nginx.conf /etc/nginx/conf.d/helios.conf
This diff is collapsed.
Click to expand it.
nginx.conf
deleted
100644 → 0
+
0
−
23
View file @
54e94f9e
upstream
helios
{
ip_hash
;
server
app
:
8000
;
}
server
{
server_name
helios
;
listen
8080
;
client_max_body_size
10M
;
proxy_connect_timeout
60
;
proxy_send_timeout
60
;
proxy_read_timeout
60
;
send_timeout
60
;
location
/
{
proxy_pass
http://helios/
;
proxy_set_header
Host
$host
;
proxy_set_header
X-Forwarded-Proto
https
;
proxy_set_header
X-Forwarded-For
$proxy_add_x_forwarded_for
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment