Skip to content

Commit ef247d1

Browse files
wavejumperwavejumper
committed
Move entrypoint.sh to resources/
1 parent cddbd28 commit ef247d1

File tree

15 files changed

+15
-33
lines changed

15 files changed

+15
-33
lines changed

‎.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,35 +99,35 @@ jobs:
9999
VERSION=${{github.event.inputs.version}}
100100
IMAGE_ID=ghcr.io/factorhouse/kpow/kpow
101101
IMAGE_TAG=$VERSION-aws-mkt-lm
102-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-lm/Dockerfile dockerfile/aws-mkt-lm/.
102+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-lm/Dockerfile
103103
104104
- name: Build Kpow AWS Marketplace Hourly
105105
run: |
106106
VERSION=${{github.event.inputs.version}}
107107
IMAGE_ID=ghcr.io/factorhouse/kpow/kpow
108108
IMAGE_TAG=$VERSION-aws-mkt-pro
109-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-pro/Dockerfile dockerfile/aws-mkt-pro/.
109+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-pro/Dockerfile
110110
111111
- name: Build Kpow
112112
run: |
113113
VERSION=${{github.event.inputs.version}}
114114
IMAGE_ID=factorhouse/kpow
115115
IMAGE_TAG=$VERSION
116-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile dockerfile/kpow/.
116+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile
117117
118118
- name: Build Kpow (latest)
119119
run: |
120120
VERSION=${{github.event.inputs.version}}
121121
IMAGE_ID=factorhouse/kpow
122122
IMAGE_TAG=latest
123-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile dockerfile/kpow/.
123+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile
124124
125125
- name: Build Kpow Red Hat UBI
126126
run: |
127127
VERSION=${{github.event.inputs.version}}
128128
IMAGE_ID=factorhouse/kpow
129129
IMAGE_TAG=$VERSION-rh-ubi
130-
./scripts/build_amd64.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/rh-ubi/Dockerfile dockerfile/rh-ubi/.
130+
./scripts/build_amd64.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/rh-ubi/Dockerfile
131131
132132
- name: Build Kpow Community
133133
run: |

‎.github/workflows/release_aws_only.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ jobs:
5353
VERSION=${{github.event.inputs.version}}
5454
IMAGE_ID=factorhouse/kpow
5555
IMAGE_TAG=$VERSION-aws-mkt-lm
56-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-lm/Dockerfile dockerfile/aws-mkt-lm/.
56+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-lm/Dockerfile
5757
5858
- name: Build Kpow AWS Marketplace Hourly (SE)
5959
run: |
6060
VERSION=${{github.event.inputs.version}}
6161
IMAGE_ID=factorhouse/kpow
6262
IMAGE_TAG=$VERSION-aws-mkt-pro
63-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-pro/Dockerfile dockerfile/aws-mkt-pro/.
63+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/aws-mkt-pro/Dockerfile

‎.github/workflows/release_rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ jobs:
6565
VERSION=${{github.event.inputs.version}}
6666
IMAGE_ID=factorhouse/kpow
6767
IMAGE_TAG=$VERSION
68-
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile dockerfile/kpow/.
68+
./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile

‎dockerfile/aws-mkt-lm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL name="Kpow for Apache Kafka" \
1313

1414
COPY resources/eula.txt /licenses/eula.txt
1515
COPY target/kpow-aws-mkt-lm-standalone.jar /opt/factorhouse/lib/kpow.jar
16-
COPY entrypoint.sh /usr/local/bin/kpow.sh
16+
COPY resources/entrypoint.sh /usr/local/bin/kpow.sh
1717

1818
RUN chown -R 1001:1001 /opt/factorhouse
1919

‎dockerfile/aws-mkt-pro/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL name="Kpow for Apache Kafka" \
1313

1414
COPY resources/eula.txt /licenses/eula.txt
1515
COPY target/kpow-aws-mkt-pro-standalone.jar /opt/factorhouse/lib/kpow.jar
16-
COPY entrypoint.sh /usr/local/bin/kpow.sh
16+
COPY resources/entrypoint.sh /usr/local/bin/kpow.sh
1717

1818
RUN chown -R 1001:1001 /opt/factorhouse
1919

‎dockerfile/aws-mkt-pro/entrypoint.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎dockerfile/kpow-ce/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL name="Kpow for Apache Kafka" \
1313

1414
COPY resources/eula.txt /licenses/eula.txt
1515
COPY target/kpow-ce-standalone.jar /opt/factorhouse/lib/kpow.jar
16-
COPY entrypoint.sh /usr/local/bin/kpow.sh
16+
COPY resources/entrypoint.sh /usr/local/bin/kpow.sh
1717

1818
RUN mkdir -p /opt/factorhouse/config/kpow
1919
RUN chown -R 1001:1001 /opt/factorhouse

‎dockerfile/kpow-ce/entrypoint.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎dockerfile/kpow/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL name="Kpow for Apache Kafka" \
1313

1414
COPY resources/eula.txt /licenses/eula.txt
1515
COPY target/kpow-java17-standalone.jar /opt/factorhouse/lib/kpow.jar
16-
COPY entrypoint.sh /usr/local/bin/kpow.sh
16+
COPY resources/entrypoint.sh /usr/local/bin/kpow.sh
1717

1818
RUN chown -R 1001:1001 /opt/factorhouse
1919

‎dockerfile/kpow/entrypoint.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎dockerfile/rh-ubi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ USER 0
1515

1616
ADD --chmod=044 resources/eula.txt /licenses/eula.txt
1717
ADD --chmod=044 target/kpow-java17-standalone.jar /opt/factorhouse/lib/kpow.jar
18-
ADD --chmod=044 entrypoint.sh /usr/local/bin/kpow.sh
18+
ADD --chmod=044 resources/entrypoint.sh /usr/local/bin/kpow.sh
1919

2020
RUN chown -R 1001:1001 /opt/factorhouse
2121

‎dockerfile/rh-ubi/entrypoint.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎dockerfile/aws-mkt-lm/entrypoint.sh renamed to ‎resources/entrypoint.sh

File renamed without changes.

‎scripts/build_all.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ IMAGE_ID=$2
77
IMAGE_TAG=$3
88
DOCKERFILE=$4
99
RELEASE=`date +%s`
10-
BUILD_DIR=$5
1110

1211
docker buildx build --pull \
1312
--build-arg RELEASE=$RELEASE \
@@ -17,4 +16,4 @@ docker buildx build --pull \
1716
--provenance=true \
1817
-f $DOCKERFILE \
1918
-t $IMAGE_ID:$IMAGE_TAG \
20-
--push $BUILD_DIR
19+
--push .

‎scripts/build_amd64.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ IMAGE_ID=$2
77
IMAGE_TAG=$3
88
DOCKERFILE=$4
99
RELEASE=`date +%s`
10-
BUILD_DIR=$5
1110

1211
docker buildx build --pull \
1312
--build-arg RELEASE=$RELEASE \
@@ -17,4 +16,4 @@ docker buildx build --pull \
1716
--provenance=true \
1817
-f $DOCKERFILE \
1918
-t $IMAGE_ID:$IMAGE_TAG \
20-
--push $BUILD_DIR
19+
--push .

0 commit comments

Comments
 (0)