Skip to content

Commit

Permalink
Merge branch 'master' of github.com:litmuschaos/test-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
uditgaurav committed Dec 6, 2023
2 parents c914539 + d38947d commit de32cf6
Show file tree
Hide file tree
Showing 46 changed files with 3,699 additions and 547 deletions.
30 changes: 16 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
mongo-utils: ${{ steps.filter.outputs.mongo-utils }}
litmusctl: ${{ steps.filter.outputs.litmusctl }}
litmus-redis-load: ${{ steps.filter.outputs.litmus-redis-load }}
litmus-snyk-image: ${{ steps.filter.outputs.litmus-snyk-image }}
litmus-helm-agent: ${{ steps.filter.outputs.litmus-helm-agent }}
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -141,8 +141,8 @@ jobs:
- 'custom/litmusctl/**'
litmus-redis-load:
- 'custom/workflow-helper/redis-helper/load-gen/**'
litmus-snyk-image:
- 'custom/security/snyk/**'
litmus-helm-agent:
- 'custom/litmus-helm-agent/**'
litmus-app-deployer:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -254,17 +254,6 @@ jobs:
- name: Building cassandra-client image
run: make cassandra-client

litmus-snyk-image:
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.litmus-snyk-image == 'true'
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Building litmus-snyk-image image
run: make litmus-snyk-image

litmus-argocli:
runs-on: ubuntu-latest
needs: changes
Expand Down Expand Up @@ -556,3 +545,16 @@ jobs:
- name: Building litmus-redis-load image
run: |
make litmus-redis-load
litmus-helm-agent:
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.litmus-helm-agent == 'true'
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Building litmus-helm-agent image
run: |
make docker.buildx
make litmus-helm-agent
34 changes: 18 additions & 16 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
mongo-utils: ${{ steps.filter.outputs.mongo-utils }}
litmusctl: ${{ steps.filter.outputs.litmusctl }}
litmus-redis-load: ${{ steps.filter.outputs.litmus-redis-load }}
litmus-snyk-image: ${{ steps.filter.outputs.litmus-snyk-image }}
litmus-helm-agent: ${{ steps.filter.outputs.litmus-helm-agent }}

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -149,8 +149,8 @@ jobs:
- 'custom/litmusctl/**'
litmus-redis-load:
- 'custom/workflow-helper/redis-helper/load-gen/**'
litmus-snyk-image:
- 'custom/security/snyk/**'
litmus-helm-agent:
- 'custom/litmus-helm-agent/**'
litmus-app-deployer:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -259,18 +259,7 @@ jobs:
run: |
make docker.buildx
make _push_litmus_git_app_checker
litmus-snyk-image:
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.litmus-snyk-image == 'true'
steps:
- uses: actions/checkout@v2
- name: Building litmus-snyk-image image
run: make litmus-snyk-image
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

litmus-k8s:
runs-on: ubuntu-latest
needs: changes
Expand Down Expand Up @@ -634,4 +623,17 @@ jobs:
- name: Building litmus-redis-load image
run: |
make docker.buildx
make _push_litmus_redis_load
make _push_litmus_redis_load
litmus-helm-agent:
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.litmus-helm-agent == 'true'
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Building litmus-helm-agent image
run: |
make docker.buildx
make _push_litmus_agent
13 changes: 11 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
create_release:
name: create_release
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
tag: ${{ github.event.inputs.release_tag }}

push:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
needs: create_release
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -142,3 +142,12 @@ jobs:
context: custom/mongo-utils/
platforms: linux/amd64,linux/arm64
tags: litmuschaos/mongo-utils:${{ github.event.inputs.release_tag }},litmuschaos/mongo-utils:latest

- name: Build and push litmus-helm-agent
uses: docker/build-push-action@v2
with:
push: true
file: custom/litmus-helm-agent/Dockerfile
context: custom/litmus-helm-agent/
platforms: linux/amd64,linux/arm64
tags: litmuschaos/litmus-helm-agent:${{ github.event.inputs.release_tag }},litmuschaos/litmus-helm-agent:latest
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -425,16 +425,6 @@ _push_litmus_redis_load:

litmus-redis-load: deps _build_litmus_redis_load _push_litmus_redis_load

_build_litmus_snyk:
@echo "INFO: Building container image for litmuschaos/snyk"
cd custom/security/snyk/ && docker build -t litmuschaos/snyk:1.0 . --build-arg SNYK_TOKEN=${SNYK_TOKEN}

_push_litmus_snyk:
@echo "INFO: Publish container litmuschaos/litmuschaos/snyk"
cd custom/security/snyk/ && ./buildscripts/push

litmus-snyk-image: deps _build_litmus_snyk _push_litmus_snyk

PHONY: go-build
go-build: experiment-go-binary

Expand All @@ -455,3 +445,13 @@ docker.buildx:
docker buildx use multibuilder;\
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes;\
fi

litmus-helm-agent: deps _build_litmus_helm_agent _push_litmus_helm_agent

_build_litmus_helm_agent:
@echo "INFO: Building container image for litmuschaos/litmus-helm-agent"
cd custom/litmus-helm-agent/ && docker build -t litmuschaos/litmus-helm-agent .

_push_litmus_helm_agent:
@echo "INFO: Publish container litmuschaos/litmus-helm-agent"
cd custom/litmus-helm-agent/ && ./buildscripts/push
2 changes: 1 addition & 1 deletion custom/argo-server/buildscripts/push
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ];
then
docker login -u "${DNAME}" -p "${DPASS}";
#Push to docker hub repository with latest tag
docker buildx build -f Dockerfile --progress plane --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/argocli:v2.11.0 .
docker buildx build -f Dockerfile --progress plain --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/argocli:v2.11.0 .
else
echo "No docker credentials provided. Skip uploading litmuschaos/argocli:v2.11.0 to docker hub";
fi;
2 changes: 1 addition & 1 deletion custom/argo-workflow-controller/buildscripts/push
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ];
then
docker login -u "${DNAME}" -p "${DPASS}";
#Push to docker hub repository with latest tag
docker buildx build -f Dockerfile --progress plane --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/workflow-controller:v3.3.1 .
docker buildx build -f Dockerfile --progress plain --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/workflow-controller:v3.3.1 .
else
echo "No docker credentials provided. Skip uploading litmuschaos/workflow-controller:v3.3.1 to docker hub";
fi;
2 changes: 1 addition & 1 deletion custom/argo-workflow-executor/buildscripts/push
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ];
then
docker login -u "${DNAME}" -p "${DPASS}";
#Push to docker hub repository with latest tag
docker buildx build -f Dockerfile --progress plane --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/argoexec:v3.3.1 .
docker buildx build -f Dockerfile --progress plain --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/argoexec:v3.3.1 .
else
echo "No docker credentials provided. Skip uploading litmuschaos/argoexec:v3.3.1 to docker hub";
fi;
2 changes: 1 addition & 1 deletion custom/curl/buildscripts/push
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ];
then
docker login -u "${DNAME}" -p "${DPASS}";
#Push to docker hub repository with latest tag
docker buildx build -f Dockerfile --progress plane --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/curl:latest .
docker buildx build -f Dockerfile --progress plain --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/curl:latest .
else
echo "No docker credentials provided. Skip uploading litmuschaos/curl:latest to docker hub";
fi;
11 changes: 9 additions & 2 deletions custom/dns_interceptor/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
module github.com/litmuschaos/dns_interceptor

go 1.14
go 1.20

require (
github.com/miekg/dns v1.1.41
github.com/sirupsen/logrus v1.8.1
github.com/sirupsen/logrus v1.9.3
)

require (
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
golang.org/x/sys v0.5.0 // indirect
)

replace golang.org/x/net => golang.org/x/net v0.7.0
37 changes: 28 additions & 9 deletions custom/dns_interceptor/go.sum
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g=
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
3 changes: 2 additions & 1 deletion custom/dns_interceptor/server/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"bufio"
"encoding/json"
"errors"
log "github.com/sirupsen/logrus"
"net"
"os"
"strings"

log "github.com/sirupsen/logrus"
)

// getInterceptorSettings generates the interceptor settings from the env
Expand Down
18 changes: 7 additions & 11 deletions custom/hardened-alpine/experiment/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile contains the hardened alpine image with all the
# litmus experiment dependencies installed.
# It is also made non-root, sudo-enabled with default litmus directory.
FROM alpine:3.15.0
FROM alpine:3.16.2

LABEL maintainer="LitmusChaos"

Expand Down Expand Up @@ -43,23 +43,19 @@ RUN set -ex && \
/usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib

# Change default shell from ash to bash
RUN sed -i -e "s/bin\/ash/bin\/bash/" /etc/passwd
RUN sed -i -e "s/bin\/ash/bin\/bash/" /etc/passwd

#Installing Kubectl
ENV KUBE_LATEST_VERSION="v1.21.2"
RUN curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/${TARGETARCH}/kubectl -o /usr/local/bin/kubectl && \
chmod +x /usr/local/bin/kubectl

#Installing crictl binaries
RUN curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.16.0/crictl-v1.16.0-linux-${TARGETARCH}.tar.gz --output crictl-v1.16.0-linux-${TARGETARCH}.tar.gz && \
tar zxvf crictl-v1.16.0-linux-${TARGETARCH}.tar.gz -C /usr/local/bin

#Installing pumba binaries
ENV PUMBA_VERSION="0.8.0"
RUN curl -L https://github.com/alexei-led/pumba/releases/download/${PUMBA_VERSION}/pumba_linux_${TARGETARCH} --output /usr/local/bin/pumba && chmod +x /usr/local/bin/pumba
RUN curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.28.0/crictl-v1.28.0-linux-${TARGETARCH}.tar.gz --output crictl-v1.28.0-linux-${TARGETARCH}.tar.gz && \
tar zxvf crictl-v1.28.0-linux-${TARGETARCH}.tar.gz -C /usr/local/bin

#Installing promql cli binaries
RUN curl -L https://github.com/chaosnative/promql-cli/releases/download/2.6.0/promql_linux_${TARGETARCH} --output /usr/local/bin/promql && chmod +x /usr/local/bin/promql
RUN curl -L https://github.com/chaosnative/promql-cli/releases/download/3.0.0/promql_linux_${TARGETARCH} --output /usr/local/bin/promql && chmod +x /usr/local/bin/promql

#Installing nsutil cli binaries
RUN curl -L https://github.com/litmuschaos/test-tools/releases/download/${LITMUS_VERSION}/nsutil-linux-${TARGETARCH} --output /usr/local/bin/nsutil && chmod +x /usr/local/bin/nsutil
Expand Down Expand Up @@ -155,7 +151,7 @@ RUN find /bin /etc /lib /sbin /usr -xdev \( \
-iname od -o \
-iname strings -o \
-iname su -o \
# -iname sudo \
# -iname sudo \
\) -delete

# Remove init scripts since we do not use them.
Expand All @@ -175,4 +171,4 @@ RUN find /bin /etc /lib /sbin /usr -xdev -type l -exec test ! -e {} \; -delete

# default directory is /litmus
WORKDIR $APP_DIR
USER ${APP_USER}
USER ${APP_USER}
2 changes: 1 addition & 1 deletion custom/hardened-alpine/experiment/buildscripts/push
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ];
then
docker login -u "${DNAME}" -p "${DPASS}";
docker buildx build . -f Dockerfile --progress plane --push --no-cache --platform linux/amd64,linux/arm64 --build-arg LITMUS_VERSION=2.10.0 --tag litmuschaos/experiment-alpine:latest
docker buildx build . -f Dockerfile --progress plain --push --no-cache --platform linux/amd64,linux/arm64 --build-arg LITMUS_VERSION=2.10.0 --tag litmuschaos/experiment-alpine:latest
else
echo "No docker credentials provided. Skip uploading litmuschaos/experiment-alpine:latest to docker hub";
fi;
Expand Down
4 changes: 2 additions & 2 deletions custom/hardened-alpine/infra/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile contains the hardened alpine image that can be used in litmus components.
# It is also made non-root with default litmus directory.
FROM alpine:3.15.0
FROM alpine:3.16.2

LABEL maintainer="LitmusChaos"

Expand Down Expand Up @@ -113,4 +113,4 @@ RUN find /bin /etc /lib /sbin /usr -xdev -type l -exec test ! -e {} \; -delete

# default directory is /litmus
WORKDIR $APP_DIR
USER ${APP_USER}
USER ${APP_USER}
2 changes: 1 addition & 1 deletion custom/hardened-alpine/infra/buildscripts/push
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ];
then
docker login -u "${DNAME}" -p "${DPASS}";
docker buildx build . -f Dockerfile --progress plane --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/infra-alpine:latest
docker buildx build . -f Dockerfile --progress plain --push --no-cache --platform linux/amd64,linux/arm64 --tag litmuschaos/infra-alpine:latest
else
echo "No docker credentials provided. Skip uploading litmuschaos/infra-alpine:latest to docker hub";
fi;
Loading

0 comments on commit de32cf6

Please sign in to comment.