diff --git a/.drone.yml b/.drone.yml index 07eaa5a2983..c1237013ae0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,19 +11,7 @@ pipeline: when: event: [pull_request] - docker-publish-algolia: - group: publish - image: plugins/docker - dockerfile: Dockerfile.algolia - repo: rancher/docs - context: . - tag: algolia - secrets: [docker_username, docker_password] - when: - branch: master - event: push - - docker-publish-dev: + publish-dev: group: publish image: plugins/docker dockerfile: Dockerfile.dev @@ -35,7 +23,7 @@ pipeline: branch: master event: push - docker-publish-staging: + publish-staging: group: publish image: plugins/docker dockerfile: Dockerfile.staging @@ -47,7 +35,7 @@ pipeline: branch: staging event: push - docker-publish-latest: + publish-latest: group: publish image: plugins/docker dockerfile: Dockerfile.prod @@ -58,3 +46,15 @@ pipeline: when: branch: master event: push + + publish-algolia: + image: plugins/docker + dockerfile: Dockerfile.algolia + repo: rancher/docs + context: . + tag: algolia + secrets: [docker_username, docker_password] + when: + branch: master + event: push + diff --git a/Dockerfile.prod b/Dockerfile.prod index 284a4fbe537..32e336d25e5 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -24,5 +24,5 @@ RUN stat /output/index.html RUN ["npm","run","build-algolia"] FROM nginx:alpine -COPY --from=build /output /usr/share/nginx/html/ +COPY --from=build /output /usr/share/nginx/html/docs/ COPY nginx.conf /etc/nginx/conf.d/default.conf diff --git a/Dockerfile.staging b/Dockerfile.staging index 172f44aaee8..4d8fac89f53 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -22,5 +22,5 @@ RUN ["hugo", "--buildDrafts", "--buildFuture", "--baseURL=https://staging.ranche RUN stat /output/index.html FROM nginx:alpine -COPY --from=build /output /usr/share/nginx/html/ +COPY --from=build /output /usr/share/nginx/html/docs/ COPY nginx.conf /etc/nginx/conf.d/default.conf