Browse Source

Go back to cp-based control archive but right

Joshua M. Boniface 5 năm trước cách đây
mục cha
commit
e87a10235b

+ 1 - 1
deployment/Dockerfile.debian.amd64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current

+ 1 - 1
deployment/Dockerfile.debian.arm64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current

+ 1 - 1
deployment/Dockerfile.debian.armhf

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current

+ 1 - 1
deployment/Dockerfile.ubuntu.amd64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current

+ 1 - 1
deployment/Dockerfile.ubuntu.arm64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current

+ 1 - 1
deployment/Dockerfile.ubuntu.armhf

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current

+ 2 - 2
deployment/build.debian.amd64

@@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
     sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi
 
@@ -21,7 +21,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 

+ 2 - 2
deployment/build.debian.arm64

@@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
     sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi
 
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 

+ 2 - 2
deployment/build.debian.armhf

@@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
     sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi
 
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 

+ 2 - 2
deployment/build.ubuntu.amd64

@@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
     sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi
 
@@ -21,7 +21,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 

+ 2 - 2
deployment/build.ubuntu.arm64

@@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
     sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi
 
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 

+ 2 - 2
deployment/build.ubuntu.armhf

@@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
     sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi
 
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi