Skip to content

Commit

Permalink
fix: helm diff install in otomi tools image
Browse files Browse the repository at this point in the history
  • Loading branch information
CasLubbers committed May 27, 2024
1 parent 502ba2f commit 45d804e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# will bypass docker but expects all binaries present on host
IN_DOCKER=false
VERBOSITY=2
# will disable contacting the cluster as found in kube context:
DISABLE_SYNC=1
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ARG SKIP_TESTS='false'
ENV NODE_ENV='test'
ENV CI=true
ENV ENV_DIR=$APP_HOME/env
ENV IN_DOCKER=false
ENV VERBOSITY='2'
ENV DISABLE_SYNC='1'
ENV NODE_PATH='dist'
Expand All @@ -32,7 +31,6 @@ FROM otomi/tools:multi-arch as prod

ENV APP_HOME=/home/app/stack
ENV ENV_DIR=/home/app/stack/env
ENV IN_DOCKER=false
ENV VERBOSITY='0'
ENV NODE_NO_WARNINGS='1'
ENV NODE_PATH='dist'
Expand Down
1 change: 0 additions & 1 deletion bin/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ function _rind() {
docker run --rm \
$LINUX_WORKAROUND \
-v $ENV_DIR:$ENV_DIR \
-e IN_DOCKER=false \
-e ENV_DIR=$ENV_DIR \
$otomi_tools_image $cmd "$@"
return $?
Expand Down
3 changes: 2 additions & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ COPY --from=builder /usr/bin /usr/bin
# Copy over node_modules (npm)
COPY --from=builder /usr/lib /usr/lib
# Copy over tools
COPY --from=builder /home/app/tools /home/app/tools
COPY --from=builder $APP_HOME $APP_HOME
COPY --from=builder $HOME/.local/share/helm/plugins $HOME/.local/share/helm/plugins

RUN chown -R app:app /home/app
USER app
Expand Down
1 change: 0 additions & 1 deletion values/otomi-api/otomi-api.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ env:
CUSTOM_ROOT_CA: |
{{- $v._derived.caCert | nindent 4 }}
{{- end }}
IN_DOCKER: 'false'
EDITOR_INACTIVITY_TIMEOUT: {{ $o.editorInactivityTimeout }}
DRONE_WEBHOOK_SECRET: {{ $d | get "sharedSecret" }}

Expand Down

0 comments on commit 45d804e

Please sign in to comment.