Skip to content

Commit

Permalink
fix: add nginx config
Browse files Browse the repository at this point in the history
Update nginx config
  • Loading branch information
suyuan32 committed Oct 11, 2022
1 parent 522f91f commit db9eec5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
12 changes: 2 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
variables:
VERSION: 0.0.15
VERSION: 0.0.19
REPO: docker.io

stages:
- info
- build
- publish
- clean

info-job:
stage: info
Expand All @@ -30,11 +29,4 @@ deploy-job:
script:
- echo "Publish docker images..."
- make publish-docker
- echo "Docker images successfully published."

clean-job:
stage: clean
script:
# 删除所有 none 镜像 | delete all none images
- docker images |grep none|awk '{print $3}'|xargs docker rmi
- echo "Delete all none images successfully."
- echo "Docker images successfully published."
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
From nginx:1.23.1-alpine

COPY dist/ /usr/share/nginx/html/
COPY deploy/default.conf /etc/nginx/conf.d/

LABEL MAINTAINER="RyanSU@yuansu.china.work@gmail.com"

Expand Down
19 changes: 19 additions & 0 deletions deploy/default.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
server {
listen 80;
listen [::]:80;
server_name localhost;

location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}

location /sys-api/ {
proxy_pass http://coreapi-svc.simple-admin.svc.cluster.local:9100/;
}

# location /file-manager/ {
# proxy_pass http://fileapi-svc:9102/;
# }
}

0 comments on commit db9eec5

Please sign in to comment.