Skip to content

Commit e4d6b26

Browse files
authored
Merge pull request #3 from linuxserver/alpine320-sed
fix sed, make alpine320 stable
2 parents a820cf2 + 2d8771c commit e4d6b26

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RUN \
9696
\( \
9797
-type d -a \( -name test -o -name tests \) \
9898
\) -exec rm -rf '{}' + && \
99-
sed -i 's|pythoncompiled|usr/local|' /pythoncompiled/bin/pip /pythoncompiled/bin/pip* /pythoncompiled/bin/wheel && \
99+
find /pythoncompiled/bin -type f -not \( -name 'python*' \) -exec sed -i 's|pythoncompiled|usr/local|' '{}' '+' && \
100100
echo "**** cleanup ****" && \
101101
apk del --purge \
102102
build-dependencies && \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RUN \
9696
\( \
9797
-type d -a \( -name test -o -name tests \) \
9898
\) -exec rm -rf '{}' + && \
99-
sed -i 's|pythoncompiled|usr/local|' /pythoncompiled/bin/pip /pythoncompiled/bin/pip* /pythoncompiled/bin/wheel && \
99+
find /pythoncompiled/bin -type f -not \( -name 'python*' \) -exec sed -i 's|pythoncompiled|usr/local|' '{}' '+' && \
100100
echo "**** cleanup ****" && \
101101
apk del --purge \
102102
build-dependencies && \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ pipeline {
763763
"target_commitish": "alpine320",\
764764
"name": "'${META_TAG}'",\
765765
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
766-
printf '","draft": false,"prerelease": true}' >> releasebody.json
766+
printf '","draft": false,"prerelease": false}' >> releasebody.json
767767
paste -d'\\0' start releasebody.json > releasebody.json.done
768768
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
769769
}

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-python
55
external_type: custom_json
6-
release_type: prerelease
6+
release_type: stable
77
release_tag: alpine320
88
ls_branch: alpine320
99
skip_package_check: true

0 commit comments

Comments
 (0)