Swapped entrypoint name from dockerfiles

Achiefs · Oct 26, 2024 · f10cec9 · f10cec9
1 parent 44ae8a2
commit f10cec9
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 12 deletions.
diff --git a/pkg/deb/docker/Dockerfile.amd64 b/pkg/deb/docker/Dockerfile.amd64
@@ -7,7 +7,7 @@ RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
     mkdir -p /tmp/output
 
 # It requires to copy the entrypoint.sh to the docker folder.
-ADD entrypoint_deb.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+ADD entrypoint.sh /usr/local/bin/entrypoint_deb.sh
+RUN chmod +x /usr/local/bin/entrypoint_deb.sh
 
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint_deb.sh" ]
diff --git a/pkg/deb/docker/Dockerfile.arm64 b/pkg/deb/docker/Dockerfile.arm64
@@ -7,7 +7,7 @@ RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
     mkdir -p /tmp/output
 
 # It requires to copy the entrypoint.sh to the docker folder.
-ADD entrypoint_deb.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+ADD entrypoint.sh /usr/local/bin/entrypoint_deb.sh
+RUN chmod +x /usr/local/bin/entrypoint_deb.sh
 
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint_deb.sh" ]
diff --git a/pkg/deb/docker/entrypoint.sh b/pkg/deb/docker/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -xe
+
+ref=$1
+
+mkdir -p /tmp/repo
+cd /tmp/repo
+git clone https://github.com/Achiefs/fim.git -b ${ref} --depth=1
+cd fim/pkg/deb
+./builder.sh
+cp fim_*.deb /tmp/output/
+chown 1000:1000 /tmp/output/fim_*.deb
diff --git a/pkg/rpm/docker/Dockerfile.aarch64 b/pkg/rpm/docker/Dockerfile.aarch64
@@ -4,7 +4,7 @@ RUN yum update -y && \
     yum install -y rpm-build tar gcc git && \
     mkdir -p /tmp/output
 
-ADD entrypoint_rpm.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+ADD entrypoint.sh /usr/local/bin/entrypoint_rpm.sh
+RUN chmod +x /usr/local/bin/entrypoint_rpm.sh
 
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint_rpm.sh" ]
diff --git a/pkg/rpm/docker/Dockerfile.x86_64 b/pkg/rpm/docker/Dockerfile.x86_64
@@ -7,7 +7,7 @@ RUN yum update -y && \
     yum install -y rpm-build tar gcc git && \
     mkdir -p /tmp/output
 
-ADD entrypoint_rpm.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+ADD entrypoint.sh /usr/local/bin/entrypoint_rpm.sh
+RUN chmod +x /usr/local/bin/entrypoint_rpm.sh
 
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint_rpm.sh" ]
diff --git a/pkg/rpm/docker/entrypoint.sh b/pkg/rpm/docker/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -xe
+
+ref=$1
+
+mkdir -p /tmp/repo
+cd /tmp/repo
+git clone https://github.com/Achiefs/fim.git -b ${ref} --depth=1
+cd fim/pkg/rpm
+./builder.sh
+cp fim-*.rpm /tmp/output/
+chown 1000:1000 /tmp/output/fim-*.rpm