Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Proxy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
open-source
Proxy
Commits
4acfe228
Commit
4acfe228
authored
5 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Patches
Plain Diff
added review stage
parent
2a20ac71
No related branches found
Branches containing commit
No related tags found
1 merge request
!5
Resolve "Make Proxy Use Autodevops"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+10
-0
10 additions, 0 deletions
.gitlab-ci.yml
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
with
11 additions
and
1 deletion
.gitlab-ci.yml
+
10
−
0
View file @
4acfe228
...
@@ -4,6 +4,8 @@ variables:
...
@@ -4,6 +4,8 @@ variables:
stages
:
stages
:
-
prepare
-
prepare
-
build
-
build
-
review
-
cleanup
prepare_node
:
prepare_node
:
stage
:
prepare
stage
:
prepare
...
@@ -43,3 +45,11 @@ include:
...
@@ -43,3 +45,11 @@ include:
build
:
build
:
services
:
services
:
include
:
-
template
:
Jobs/Deploy.gitlab-ci.yml
review
:
variables
:
HELM_UPGRADE_EXTRA_ARGS
:
--set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
4acfe228
...
@@ -2,7 +2,7 @@ FROM nginx
...
@@ -2,7 +2,7 @@ FROM nginx
RUN
apt
-y
update
&&
apt
-y
install
php-fpm ca-certificates zip php7.3-mbstring php7.3-dom php7.3-zip php7.3-curl
RUN
apt
-y
update
&&
apt
-y
install
php-fpm ca-certificates zip php7.3-mbstring php7.3-dom php7.3-zip php7.3-curl
COPY
/
/html
COPY
.
/html
COPY
/service-configs/nginx/default.conf /etc/nginx/conf.d/default.conf
COPY
/service-configs/nginx/default.conf /etc/nginx/conf.d/default.conf
RUN
sed
-i
's/listen.owner = www-data/listen.owner = nginx/g'
/etc/php/7.3/fpm/pool.d/www.conf
RUN
sed
-i
's/listen.owner = www-data/listen.owner = nginx/g'
/etc/php/7.3/fpm/pool.d/www.conf
...
...
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