From e453c823b186c91c303a51b60c2e757d76dcaa70 Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 09:20:13 -0700 Subject: [PATCH 1/9] Draft create --- .dockerignore | 5 ++ .helmignore | 27 ++++++ Dockerfile | 6 ++ Jenkinsfile | 92 ++++++++++++++++++++ charts/preview/Chart.yaml | 5 ++ charts/preview/Makefile | 18 ++++ charts/preview/requirements.yaml | 13 +++ charts/preview/values.yaml | 22 +++++ charts/testobjects/.helmignore | 21 +++++ charts/testobjects/Chart.yaml | 5 ++ charts/testobjects/Makefile | 48 ++++++++++ charts/testobjects/README.md | 1 + charts/testobjects/templates/NOTES.txt | 4 + charts/testobjects/templates/_helpers.tpl | 16 ++++ charts/testobjects/templates/deployment.yaml | 43 +++++++++ charts/testobjects/templates/service.yaml | 23 +++++ charts/testobjects/values.yaml | 34 ++++++++ skaffold.yaml | 31 +++++++ 18 files changed, 414 insertions(+) create mode 100644 .dockerignore create mode 100644 .helmignore create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 charts/preview/Chart.yaml create mode 100755 charts/preview/Makefile create mode 100755 charts/preview/requirements.yaml create mode 100755 charts/preview/values.yaml create mode 100755 charts/testobjects/.helmignore create mode 100644 charts/testobjects/Chart.yaml create mode 100755 charts/testobjects/Makefile create mode 100755 charts/testobjects/README.md create mode 100755 charts/testobjects/templates/NOTES.txt create mode 100755 charts/testobjects/templates/_helpers.tpl create mode 100755 charts/testobjects/templates/deployment.yaml create mode 100755 charts/testobjects/templates/service.yaml create mode 100755 charts/testobjects/values.yaml create mode 100644 skaffold.yaml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..762752c --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +draft.toml +charts/ +NOTICE +LICENSE +README.md \ No newline at end of file diff --git a/.helmignore b/.helmignore new file mode 100644 index 0000000..747e6e9 --- /dev/null +++ b/.helmignore @@ -0,0 +1,27 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +*.png + +# known compile time folders +target/ +node_modules/ +vendor/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8179bf6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM node:9-slim +ENV PORT 8080 +EXPOSE 8080 +WORKDIR /usr/src/app +COPY . . +CMD ["npm", "start"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..c26bac0 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,92 @@ +pipeline { + agent { + label "jenkins-nodejs" + } + environment { + ORG = 'cedexis' + APP_NAME = 'testobjects' + CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum') + } + stages { + stage('CI Build and push snapshot') { + when { + branch 'PR-*' + } + environment { + PREVIEW_VERSION = "0.0.0-SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER" + PREVIEW_NAMESPACE = "$APP_NAME-$BRANCH_NAME".toLowerCase() + HELM_RELEASE = "$PREVIEW_NAMESPACE".toLowerCase() + } + steps { + container('nodejs') { + sh "npm install" + sh "CI=true DISPLAY=:99 npm test" + + sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml' + + + sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION" + } + + dir ('./charts/preview') { + container('nodejs') { + sh "make preview" + sh "jx preview --app $APP_NAME --dir ../.." + } + } + } + } + stage('Build Release') { + when { + branch 'master' + } + steps { + container('nodejs') { + // ensure we're not on a detached head + sh "git checkout master" + sh "git config --global credential.helper store" + + sh "jx step git credentials" + // so we can retrieve the version in later steps + sh "echo \$(jx-release-version) > VERSION" + } + dir ('./charts/testobjects') { + container('nodejs') { + sh "make tag" + } + } + container('nodejs') { + sh "npm install" + sh "CI=true DISPLAY=:99 npm test" + + sh 'export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml' + + sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)" + } + } + } + stage('Promote to Environments') { + when { + branch 'master' + } + steps { + dir ('./charts/testobjects') { + container('nodejs') { + sh 'jx step changelog --version v\$(cat ../../VERSION)' + + // release the helm chart + sh 'jx step helm release' + + // promote through all 'Auto' promotion Environments + sh 'jx promote -b --all-auto --timeout 1h --version \$(cat ../../VERSION)' + } + } + } + } + } + post { + always { + cleanWs() + } + } + } diff --git a/charts/preview/Chart.yaml b/charts/preview/Chart.yaml new file mode 100644 index 0000000..6b68431 --- /dev/null +++ b/charts/preview/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/master/images/java.png +name: preview +version: 0.1.0-SNAPSHOT diff --git a/charts/preview/Makefile b/charts/preview/Makefile new file mode 100755 index 0000000..d92924b --- /dev/null +++ b/charts/preview/Makefile @@ -0,0 +1,18 @@ +OS := $(shell uname) + +preview: +ifeq ($(OS),Darwin) + sed -i "" -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml + sed -i "" -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml + sed -i "" -e "s/tag: .*/tag: $(PREVIEW_VERSION)/" values.yaml +else ifeq ($(OS),Linux) + sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml + sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml + sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/cedexis\/testobjects|" values.yaml + sed -i -e "s/tag: .*/tag: $(PREVIEW_VERSION)/" values.yaml +else + echo "platfrom $(OS) not supported to release from" + exit -1 +endif + echo " version: $(PREVIEW_VERSION)" >> requirements.yaml + jx step helm build diff --git a/charts/preview/requirements.yaml b/charts/preview/requirements.yaml new file mode 100755 index 0000000..c3594db --- /dev/null +++ b/charts/preview/requirements.yaml @@ -0,0 +1,13 @@ + +dependencies: +- alias: expose + name: exposecontroller + repository: https://chartmuseum.build.cd.jenkins-x.io + version: 2.3.56 +- alias: cleanup + name: exposecontroller + repository: https://chartmuseum.build.cd.jenkins-x.io + version: 2.3.56 +- alias: preview + name: testobjects + repository: file://../testobjects diff --git a/charts/preview/values.yaml b/charts/preview/values.yaml new file mode 100755 index 0000000..b53ceaa --- /dev/null +++ b/charts/preview/values.yaml @@ -0,0 +1,22 @@ + +expose: + Annotations: + helm.sh/hook: post-install,post-upgrade + helm.sh/hook-delete-policy: hook-succeeded + config: + exposer: Ingress + http: true + tlsacme: false + +cleanup: + Args: + - --cleanup + Annotations: + helm.sh/hook: pre-delete + helm.sh/hook-delete-policy: hook-succeeded + +preview: + image: + repository: + tag: + pullPolicy: IfNotPresent \ No newline at end of file diff --git a/charts/testobjects/.helmignore b/charts/testobjects/.helmignore new file mode 100755 index 0000000..f0c1319 --- /dev/null +++ b/charts/testobjects/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/charts/testobjects/Chart.yaml b/charts/testobjects/Chart.yaml new file mode 100644 index 0000000..a4bf7fc --- /dev/null +++ b/charts/testobjects/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/d273e09/images/nodejs.png +name: testobjects +version: 0.1.0-SNAPSHOT diff --git a/charts/testobjects/Makefile b/charts/testobjects/Makefile new file mode 100755 index 0000000..ab95fc5 --- /dev/null +++ b/charts/testobjects/Makefile @@ -0,0 +1,48 @@ +CHART_REPO := http://jenkins-x-chartmuseum:8080 +CURRENT=$(pwd) +NAME := testobjects +OS := $(shell uname) +RELEASE_VERSION := $(shell cat ../../VERSION) + +build: clean + rm -rf requirements.lock + helm dependency build + helm lint + +install: clean build + helm install . --name ${NAME} + +upgrade: clean build + helm upgrade ${NAME} . + +delete: + helm delete --purge ${NAME} + +clean: + rm -rf charts + rm -rf ${NAME}*.tgz + +release: clean + helm dependency build + helm lint + helm init --client-only + helm package . + curl --fail -u $(CHARTMUSEUM_CREDS_USR):$(CHARTMUSEUM_CREDS_PSW) --data-binary "@$(NAME)-$(shell sed -n 's/^version: //p' Chart.yaml).tgz" $(CHART_REPO)/api/charts + rm -rf ${NAME}*.tgz% + +tag: +ifeq ($(OS),Darwin) + sed -i "" -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml + sed -i "" -e "s/tag: .*/tag: $(RELEASE_VERSION)/" values.yaml +else ifeq ($(OS),Linux) + sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml + sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/cedexis\/testobjects|" values.yaml + sed -i -e "s/tag: .*/tag: $(RELEASE_VERSION)/" values.yaml +else + echo "platfrom $(OS) not supported to release from" + exit -1 +endif + git add --all + git commit -m "release $(RELEASE_VERSION)" --allow-empty # if first release then no verion update is performed + git tag -fa v$(RELEASE_VERSION) -m "Release version $(RELEASE_VERSION)" + git push origin v$(RELEASE_VERSION) diff --git a/charts/testobjects/README.md b/charts/testobjects/README.md new file mode 100755 index 0000000..83de828 --- /dev/null +++ b/charts/testobjects/README.md @@ -0,0 +1 @@ +# Javascript application \ No newline at end of file diff --git a/charts/testobjects/templates/NOTES.txt b/charts/testobjects/templates/NOTES.txt new file mode 100755 index 0000000..97823be --- /dev/null +++ b/charts/testobjects/templates/NOTES.txt @@ -0,0 +1,4 @@ + +Get the application URL by running these commands: + +kubectl get ingress {{ template "fullname" . }} diff --git a/charts/testobjects/templates/_helpers.tpl b/charts/testobjects/templates/_helpers.tpl new file mode 100755 index 0000000..f0d83d2 --- /dev/null +++ b/charts/testobjects/templates/_helpers.tpl @@ -0,0 +1,16 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/charts/testobjects/templates/deployment.yaml b/charts/testobjects/templates/deployment.yaml new file mode 100755 index 0000000..a9b19a9 --- /dev/null +++ b/charts/testobjects/templates/deployment.yaml @@ -0,0 +1,43 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ template "fullname" . }} + labels: + draft: {{ default "draft-app" .Values.draft }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + draft: {{ default "draft-app" .Values.draft }} + app: {{ template "fullname" . }} +{{- if .Values.podAnnotations }} + annotations: +{{ toYaml .Values.podAnnotations | indent 8 }} +{{- end }} + spec: + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - containerPort: {{ .Values.service.internalPort }} + livenessProbe: + httpGet: + path: {{ .Values.probePath }} + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + readinessProbe: + httpGet: + path: {{ .Values.probePath }} + port: {{ .Values.service.internalPort }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + resources: +{{ toYaml .Values.resources | indent 12 }} + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} diff --git a/charts/testobjects/templates/service.yaml b/charts/testobjects/templates/service.yaml new file mode 100755 index 0000000..8d27389 --- /dev/null +++ b/charts/testobjects/templates/service.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: +{{- if .Values.service.name }} + name: {{ .Values.service.name }} +{{- else }} + name: {{ template "fullname" . }} +{{- end }} + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +{{- if .Values.service.annotations }} + annotations: +{{ toYaml .Values.service.annotations | indent 4 }} +{{- end }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} + protocol: TCP + name: http + selector: + app: {{ template "fullname" . }} diff --git a/charts/testobjects/values.yaml b/charts/testobjects/values.yaml new file mode 100755 index 0000000..7c3f4ac --- /dev/null +++ b/charts/testobjects/values.yaml @@ -0,0 +1,34 @@ +# Default values for node projects. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. +replicaCount: 1 +image: + repository: draft + tag: dev + pullPolicy: IfNotPresent +service: + name: testobjects + type: ClusterIP + externalPort: 80 + internalPort: 8080 + annotations: + fabric8.io/expose: "true" + fabric8.io/ingress.annotations: "kubernetes.io/ingress.class: nginx" +resources: + limits: + cpu: 400m + memory: 256Mi + requests: + cpu: 200m + memory: 128Mi +probePath: / +livenessProbe: + initialDelaySeconds: 60 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 +readinessProbe: + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 +terminationGracePeriodSeconds: 10 diff --git a/skaffold.yaml b/skaffold.yaml new file mode 100644 index 0000000..4c7d408 --- /dev/null +++ b/skaffold.yaml @@ -0,0 +1,31 @@ +apiVersion: skaffold/v1alpha2 +kind: Config +build: + tagPolicy: + envTemplate: + template: "{{.DOCKER_REGISTRY}}/cedexis/testobjects:{{.VERSION}}" + artifacts: + - imageName: changeme + workspace: . + docker: {} + local: {} +deploy: + kubectl: + manifests: +profiles: +- name: dev + build: + tagPolicy: + envTemplate: + template: "{{.DOCKER_REGISTRY}}/cedexis/testobjects:{{.DIGEST_HEX}}" + artifacts: + - docker: {} + local: {} + deploy: + helm: + releases: + - name: testobjects + chartPath: charts/testobjects + setValueTemplates: + image.repository: "{{.DOCKER_REGISTRY}}/cedexis/testobjects" + image.tag: "{{.DIGEST_HEX}}" From edb79414715d0515f6bd1405ff9d117d720d670d Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 12:03:31 -0700 Subject: [PATCH 2/9] Update dockerfile to be nginx --- Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8179bf6..b189bcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -FROM node:9-slim -ENV PORT 8080 -EXPOSE 8080 -WORKDIR /usr/src/app -COPY . . -CMD ["npm", "start"] \ No newline at end of file +FROM nginx +COPY . /usr/share/nginx/html +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] From 1944bd43cf514a5bb7d572ed6d6992d1c3490c41 Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 12:07:25 -0700 Subject: [PATCH 3/9] Don't run npm --- Jenkinsfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c26bac0..217df34 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,9 +19,6 @@ pipeline { } steps { container('nodejs') { - sh "npm install" - sh "CI=true DISPLAY=:99 npm test" - sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml' @@ -56,9 +53,6 @@ pipeline { } } container('nodejs') { - sh "npm install" - sh "CI=true DISPLAY=:99 npm test" - sh 'export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml' sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)" From 66c49226860b2cda80b87764c9d60bd12058678f Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 12:18:15 -0700 Subject: [PATCH 4/9] Set port to 8080 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b189bcf..1808bf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM nginx COPY . /usr/share/nginx/html -EXPOSE 80 +EXPOSE 8080 CMD ["nginx", "-g", "daemon off;"] From 928449e0529e7669863ee2b25e8b5c7f344302ea Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 12:19:43 -0700 Subject: [PATCH 5/9] Add provided nginx config --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1808bf9..b9303f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,9 @@ FROM nginx + COPY . /usr/share/nginx/html +RUN rm /etc/nginx/conf.d/default.conf +ADD pyutil/resources/testobjects.nginx.conf.example /etc/nginx/conf.d/testobjects.cedexis.com.conf + EXPOSE 8080 + CMD ["nginx", "-g", "daemon off;"] From c4b28dba5c4e74ce1ede007989ac327a7a61f2e8 Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 12:31:39 -0700 Subject: [PATCH 6/9] Expose port 8080 in nginx instead of 80 --- pyutil/resources/testobjects.nginx.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyutil/resources/testobjects.nginx.conf.example b/pyutil/resources/testobjects.nginx.conf.example index 25a209e..927d9ec 100644 --- a/pyutil/resources/testobjects.nginx.conf.example +++ b/pyutil/resources/testobjects.nginx.conf.example @@ -1,5 +1,5 @@ server { - listen 80; + listen 8080; server_name testobjects.cedexis.localhost; From 65445876c4b05a944d63366e5e9e18c1ef7dc8ba Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 12:48:09 -0700 Subject: [PATCH 7/9] Fix a woops --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b9303f8..4715aff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM nginx -COPY . /usr/share/nginx/html +COPY . /etc/nginx/html RUN rm /etc/nginx/conf.d/default.conf ADD pyutil/resources/testobjects.nginx.conf.example /etc/nginx/conf.d/testobjects.cedexis.com.conf From 663b78a658dab2be4ff3d5c9da925c717cc501c9 Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 13:01:52 -0700 Subject: [PATCH 8/9] Amend nginx config to relate to real paths --- pyutil/resources/testobjects.nginx.conf.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyutil/resources/testobjects.nginx.conf.example b/pyutil/resources/testobjects.nginx.conf.example index 927d9ec..301a442 100644 --- a/pyutil/resources/testobjects.nginx.conf.example +++ b/pyutil/resources/testobjects.nginx.conf.example @@ -1,10 +1,10 @@ server { listen 8080; - server_name testobjects.cedexis.localhost; + server_name _; location /r16 { - alias /home/jacob/repos/cedexis/testobjects/r16; + alias /etc/nginx/html/r16; gzip_static on; } } From af64e810e2cba0b116d6f3ae492c984c6304e5a2 Mon Sep 17 00:00:00 2001 From: "Svyatoslav I. Maslennikov" Date: Wed, 12 Sep 2018 13:10:15 -0700 Subject: [PATCH 9/9] Revert alias change --- pyutil/resources/testobjects.nginx.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyutil/resources/testobjects.nginx.conf.example b/pyutil/resources/testobjects.nginx.conf.example index 301a442..1928fa5 100644 --- a/pyutil/resources/testobjects.nginx.conf.example +++ b/pyutil/resources/testobjects.nginx.conf.example @@ -4,7 +4,7 @@ server { server_name _; location /r16 { - alias /etc/nginx/html/r16; + alias /home/jacob/repos/cedexis/testobjects/r16; gzip_static on; } }