mirror/ docker-lineage-cicd
1
0
Fork 0
mirror of https://github.com/lineageos4microg/docker-lineage-cicd synced 2024-05-18 03:06:07 +02:00
Code Issues

Move logic back to Dockerfile 

Improved to avoid issues in the future
This commit is contained in:
Ammako 2021-07-30 08:43:35 -04:00
parent 68e57b904c
commit 8c1c440aa7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -151,6 +151,11 @@ RUN apt-get -qq update && \
RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
chmod a+x /usr/local/bin/repo
# Re-enable TLSv1 and TLSv1.1 in OpenJDK 8 config
#(for cm-14.1/lineage-15.1, might be removed later)
###################################################
RUN echo "jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, include jdk.disabled.namedCurves" | tee -a /etc/java-8-openjdk/security/java.security
# Copy required files
#####################
COPY src/ /root/

6
src/build.sh
View File

@ -89,17 +89,13 @@ for branch in ${BRANCH_NAME//,/ }; do
permissioncontroller_patch=""
case "$branch" in
cm-14.1*)
sed -i 's/, TLSv1, TLSv1.1,/,/' "/etc/java-8-openjdk/security/java.security"
echo ">> [$(date)] Re-enabling support for TLSv1 and TLSv1.1 in OpenJDK 8 config"
vendor="cm"
themuppets_branch="cm-14.1"
android_version="7.1.2"
patch_name="android_frameworks_base-N.patch"
;;
lineage-15.1*)
sed -i 's/, TLSv1, TLSv1.1,/,/' "/etc/java-8-openjdk/security/java.security"
echo ">> [$(date)] Re-enabling support for TLSv1 and TLSv1.1 in OpenJDK 8 config"
themuppets_branch="lineage-15.1"
themuppets_branch="lineage-15.1"
android_version="8.1"
patch_name="android_frameworks_base-O.patch"
;;