Skip to content

Commit e57e5fa

Browse files
fix: fixed appuser missing home dir (#40)
* fix: fixed appuser missing home dir * Update docs/docker.md Co-authored-by: caroldelwing <[email protected]> --------- Co-authored-by: caroldelwing <[email protected]>
1 parent dd2aa4f commit e57e5fa

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
env:
88
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99
PALETTE_VERSION: 4.0.2
10-
PALETTE_CLI_VERSION: 4.3.7
11-
PALETTE_EDGE_VERSION: 4.3.2
10+
PALETTE_CLI_VERSION: 4.4.0
11+
PALETTE_EDGE_VERSION: 4.4.2
1212
PACKER_VERSION: 1.11.0
1313
ORAS_VERSION: 1.0.0
14-
TERRAFORM_VERSION: 1.8.4
14+
TERRAFORM_VERSION: 1.9.0
1515
PALETTE_REGISTRY_CLI_VERSION: 4.3.0
1616

1717
jobs:

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
env:
88
GITHUB_TOKEN: ${{ github.token }}
99
PALETTE_VERSION: 4.0.2
10-
PALETTE_CLI_VERSION: 4.3.7
11-
PALETTE_EDGE_VERSION: 4.3.2
10+
PALETTE_CLI_VERSION: 4.4.0
11+
PALETTE_EDGE_VERSION: 4.4.2
1212
PACKER_VERSION: 1.11.0
1313
ORAS_VERSION: 1.0.0
14-
TERRAFORM_VERSION: 1.8.4
14+
TERRAFORM_VERSION: 1.9.0
1515
PALETTE_REGISTRY_CLI_VERSION: 4.3.0
1616

1717
concurrency:

Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ ENV REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd-basic
3333
COPY --from=server /registry /usr/local/bin/
3434
COPY --from=server /etc/spectro/config.yml /etc/spectro/config.yml
3535

36-
RUN adduser -H -u 1002 -D appuser appuser && \
36+
RUN adduser -u 1002 -D appuser appuser && \
3737
apk update && \
3838
apk add --no-cache bash curl git openssl jq bind-tools wget ca-certificates nano aws-cli xorriso govc podman
3939

40+
4041
RUN wget https://spectro-cli.s3.amazonaws.com/v$PALETTE_REGISTRY_CLI_VERSION/linux/spectro && \
4142
mv spectro /usr/local/bin/spectro && \
4243
chmod +x /usr/local/bin/spectro && \
@@ -48,8 +49,8 @@ RUN wget https://spectro-cli.s3.amazonaws.com/v$PALETTE_REGISTRY_CLI_VERSION/li
4849
curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
4950
chmod +x ./kubectl && \
5051
mv ./kubectl /usr/local/bin/kubectl && \
51-
mkdir -p ~/.config/ngrok && \
52-
cp /auth/ngrok.yml ~/.config/ngrok/ngrok.yml && \
52+
mkdir -p /home/appuser/.config/ngrok && \
53+
cp /auth/ngrok.yml /home/appuser/.config/ngrok/ngrok.yml && \
5354
wget https://software.spectrocloud.com/palette-cli/v$PALETTE_CLI_VERSION/linux/cli/palette && \
5455
mv palette /usr/local/bin/palette && \
5556
chmod +x /usr/local/bin/palette && \
@@ -65,7 +66,8 @@ RUN wget https://spectro-cli.s3.amazonaws.com/v$PALETTE_REGISTRY_CLI_VERSION/li
6566
rm -rf /var/cache/apk/* && \
6667
wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
6768
unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin && \
68-
rm -rf terraform_${TERRAFORM_VERSION}_linux_amd64.zip
69+
rm -rf terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
70+
mkdir -p /var/log/ && chmod 777 /var/log/
6971

7072
ADD https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip /usr/local/sbin/
7173
RUN unzip /usr/local/sbin/packer_${PACKER_VERSION}_linux_amd64.zip -d /usr/local/sbin && \

docs/docker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ registry serve /etc/spectro/config.yml > /var/log/registry.log 2>&1 &
6262
If you are wanting to build the docker image locally you must provide the the build arguments for `PALETTE_VERSION`, `PALETTE_CLI_VERSION`, `PALETTE_EDGE_VERSION`, `PACKER_VERSION`, `ORAS_VERSION` and `TERRAFORM_VERSION`. Use the following command to build a local image. Replace the versions as needed.
6363

6464
```shell
65-
docker build --build-arg PALETTE_VERSION=4.0.2 --build-arg PALETTE_CLI_VERSION=4.2.2 --build-arg PALETTE_EDGE_VERSION=4.2.3 --build-arg PACKER_VERSION=1.9.4 --build-arg ORAS_VERSION=1.0.0 --build-arg PALETTE_REGISTRY_CLI_VERSION=4.2.0 --build-arg TERRAFORM_VERSION=1.7.0 -t tutorials .
65+
docker build --build-arg PALETTE_VERSION=4.0.2 --build-arg PALETTE_CLI_VERSION=4.4.0 --build-arg PALETTE_EDGE_VERSION=4.4.2 --build-arg PACKER_VERSION=1.11.0 --build-arg ORAS_VERSION=1.0.0 --build-arg PALETTE_REGISTRY_CLI_VERSION=4.3.0 --build-arg TERRAFORM_VERSION=1.9.0 -t tutorials .
6666
```

0 commit comments

Comments
 (0)