From c6445d191eb2f7b1e21b63652e5894b40ed1b322 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Mon, 2 Jul 2018 14:41:45 -0700 Subject: [PATCH] Auto-builds --- .drone.yml | 21 ++++++++++++++++++--- Dockerfile.dev | 9 +++++++++ Dockerfile.prod | 11 +++++++++++ Dockerfile.staging | 10 ++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 81a13a72efa..991df0041f6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,12 @@ pipeline: repo: rancher/docs context: . tag: dev - secrets: [docker_username, docker_password] + secrets: [docker_username, docker_password, algolia_app_id, algolia_index_name, algolia_index_file, algolia_admin_key] + build_args_from_env: + - ALGOLIA_APP_ID + - ALGOLIA_INDEX_NAME + - ALGOLIA_INDEX_FILE + - ALGOLIA_ADMIN_KEY when: branch: master event: push @@ -30,7 +35,12 @@ pipeline: repo: rancher/docs context: . tag: staging - secrets: [docker_username, docker_password] + secrets: [docker_username, docker_password, algolia_app_id, algolia_index_name, algolia_index_file, algolia_admin_key] + build_args_from_env: + - ALGOLIA_APP_ID + - ALGOLIA_INDEX_NAME + - ALGOLIA_INDEX_FILE + - ALGOLIA_ADMIN_KEY when: branch: master event: push @@ -42,7 +52,12 @@ pipeline: repo: rancher/docs context: . tag: latest - secrets: [docker_username, docker_password] + secrets: [docker_username, docker_password, algolia_app_id, algolia_index_name, algolia_index_file, algolia_admin_key] + build_args_from_env: + - ALGOLIA_APP_ID + - ALGOLIA_INDEX_NAME + - ALGOLIA_INDEX_FILE + - ALGOLIA_ADMIN_KEY when: branch: master event: push diff --git a/Dockerfile.dev b/Dockerfile.dev index 26ce67c09b6..30b14aee341 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,8 @@ FROM rancher/docs:build +ARG ALGOLIA_APP_ID +ARG ALGOLIA_INDEX_NAME +ARG ALGOLIA_INDEX_FILE +ARG ALGOLIA_ADMIN_KEY VOLUME ["/site"] WORKDIR /run @@ -21,6 +25,11 @@ COPY gulpfile.babel.js /run/ ADD https://github.com/rancherlabs/website-theme/archive/master.tar.gz master.tar.gz RUN mkdir -p /run/node_modules/rancher-website-theme && tar -xzf master.tar.gz --strip 1 -C /run/node_modules/rancher-website-theme && rm master.tar.gz +ENV ALGOLIA_APP_ID=$ALGOLIA_APP_ID +ENV ALGOLIA_INDEX_NAME=$ALGOLIA_INDEX_NAME +ENV ALGOLIA_INDEX_FILE=$ALGOLIA_INDEX_FILE +ENV ALGOLIA_ADMIN_KEY=$ALGOLIA_ADMIN_KEY + # Expose default hugo port EXPOSE 9001 diff --git a/Dockerfile.prod b/Dockerfile.prod index 8cde8c68f49..9869a6412e5 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,4 +1,8 @@ FROM rancher/docs:build as build +ARG ALGOLIA_APP_ID +ARG ALGOLIA_INDEX_NAME +ARG ALGOLIA_INDEX_FILE +ARG ALGOLIA_ADMIN_KEY WORKDIR /run @@ -17,6 +21,13 @@ ENV HUGO_ENV production ADD https://github.com/rancherlabs/website-theme/archive/master.tar.gz master.tar.gz RUN tar -xzf master.tar.gz --strip 1 -C /run/node_modules/rancher-website-theme && rm master.tar.gz + + +ENV ALGOLIA_APP_ID=$ALGOLIA_APP_ID +ENV ALGOLIA_INDEX_NAME=$ALGOLIA_INDEX_NAME +ENV ALGOLIA_INDEX_FILE=$ALGOLIA_INDEX_FILE +ENV ALGOLIA_ADMIN_KEY=$ALGOLIA_ADMIN_KEY + RUN gulp build # Make sure something got built diff --git a/Dockerfile.staging b/Dockerfile.staging index 93247e0817a..d400d2f4be5 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -1,4 +1,8 @@ FROM rancher/docs:build as build +ARG ALGOLIA_APP_ID +ARG ALGOLIA_INDEX_NAME +ARG ALGOLIA_INDEX_FILE +ARG ALGOLIA_ADMIN_KEY WORKDIR /run @@ -17,6 +21,12 @@ ENV HUGO_ENV production ADD https://github.com/rancherlabs/website-theme/archive/master.tar.gz master.tar.gz RUN tar -xzf master.tar.gz --strip 1 -C /run/node_modules/rancher-website-theme && rm master.tar.gz + +ENV ALGOLIA_APP_ID=$ALGOLIA_APP_ID +ENV ALGOLIA_INDEX_NAME=$ALGOLIA_INDEX_NAME +ENV ALGOLIA_INDEX_FILE=$ALGOLIA_INDEX_FILE +ENV ALGOLIA_ADMIN_KEY=$ALGOLIA_ADMIN_KEY + RUN gulp build-staging # Make sure something got built