mirror of
				https://github.com/linuxserver/docker-swag.git
				synced 2025-11-01 05:27:42 +09:00 
			
		
		
		
	Pin certbot to 1.32.0 until plugin compatibility improves
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/external_trigger.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/external_trigger.yml
									
									
									
									
										vendored
									
									
								
							| @@ -18,7 +18,7 @@ jobs: | |||||||
|           fi |           fi | ||||||
|           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SWAG_MASTER\". ****" |           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SWAG_MASTER\". ****" | ||||||
|           echo "**** Retrieving external version ****" |           echo "**** Retrieving external version ****" | ||||||
|           EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/certbot/json" |jq -r '. | .info.version') |           EXT_RELEASE=$(echo '1.32.0') | ||||||
|           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then |           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then | ||||||
|             echo "**** Can't retrieve external version, exiting ****" |             echo "**** Can't retrieve external version, exiting ****" | ||||||
|             FAILURE_REASON="Can't retrieve external version for swag branch master" |             FAILURE_REASON="Can't retrieve external version for swag branch master" | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							| @@ -100,17 +100,18 @@ pipeline { | |||||||
|     /* ######################## |     /* ######################## | ||||||
|        External Release Tagging |        External Release Tagging | ||||||
|        ######################## */ |        ######################## */ | ||||||
|     // If this is a pip release set the external tag to the pip version |     // If this is a custom command to determine version use that command | ||||||
|     stage("Set ENV pip_version"){ |     stage("Set tag custom bash"){ | ||||||
|       steps{ |       steps{ | ||||||
|         script{ |         script{ | ||||||
|           env.EXT_RELEASE = sh( |           env.EXT_RELEASE = sh( | ||||||
|             script: '''curl -sL  https://pypi.python.org/pypi/${EXT_PIP}/json |jq -r '. | .info.version' ''', |             script: ''' echo '1.32.0' ''', | ||||||
|             returnStdout: true).trim() |             returnStdout: true).trim() | ||||||
|           env.RELEASE_LINK = 'https://pypi.python.org/pypi/' + env.EXT_PIP |             env.RELEASE_LINK = 'custom_command' | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     }    // Sanitize the release tag and strip illegal docker or github characters |     } | ||||||
|  |     // Sanitize the release tag and strip illegal docker or github characters | ||||||
|     stage("Sanitize tag"){ |     stage("Sanitize tag"){ | ||||||
|       steps{ |       steps{ | ||||||
|         script{ |         script{ | ||||||
| @@ -911,11 +912,11 @@ pipeline { | |||||||
|              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' |              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' | ||||||
|         echo "Pushing New release for Tag" |         echo "Pushing New release for Tag" | ||||||
|         sh '''#! /bin/bash |         sh '''#! /bin/bash | ||||||
|               echo "Updating PIP version of ${EXT_PIP} to ${EXT_RELEASE_CLEAN}" > releasebody.json |               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json | ||||||
|               echo '{"tag_name":"'${META_TAG}'",\ |               echo '{"tag_name":"'${META_TAG}'",\ | ||||||
|                      "target_commitish": "master",\ |                      "target_commitish": "master",\ | ||||||
|                      "name": "'${META_TAG}'",\ |                      "name": "'${META_TAG}'",\ | ||||||
|                      "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start |                      "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start | ||||||
|               printf '","draft": false,"prerelease": false}' >> releasebody.json |               printf '","draft": false,"prerelease": false}' >> releasebody.json | ||||||
|               paste -d'\\0' start releasebody.json > releasebody.json.done |               paste -d'\\0' start releasebody.json > releasebody.json.done | ||||||
|               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' |               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' | ||||||
|   | |||||||
| @@ -335,6 +335,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 | |||||||
|  |  | ||||||
| ## Versions | ## Versions | ||||||
|  |  | ||||||
|  | * **22.11.22:** - Pin certbot to 1.32.0 until plugin compatibility improves. | ||||||
| * **05.11.22:** - Update acmedns plugin handling. | * **05.11.22:** - Update acmedns plugin handling. | ||||||
| * **06.10.22:** - Switch to certbot-dns-duckdns. Update cpanel and gandi dns plugin handling. Minor adjustments to init logic. | * **06.10.22:** - Switch to certbot-dns-duckdns. Update cpanel and gandi dns plugin handling. Minor adjustments to init logic. | ||||||
| * **05.10.22:** - Use certbot file hooks instead of command line hooks | * **05.10.22:** - Use certbot file hooks instead of command line hooks | ||||||
|   | |||||||
| @@ -2,7 +2,12 @@ | |||||||
|  |  | ||||||
| # jenkins variables | # jenkins variables | ||||||
| project_name: docker-swag | project_name: docker-swag | ||||||
| external_type: pip_version |  | ||||||
|  | # Pin certbot to 1.32.0 until plugin compatibility improves | ||||||
|  | external_type: na | ||||||
|  | custom_version_command: "echo '1.32.0'" | ||||||
|  |  | ||||||
|  | #external_type: pip_version | ||||||
| release_type: stable | release_type: stable | ||||||
| release_tag: latest | release_tag: latest | ||||||
| ls_branch: master | ls_branch: master | ||||||
|   | |||||||
| @@ -157,6 +157,7 @@ app_setup_nginx_reverse_proxy_block: "" | |||||||
|  |  | ||||||
| # changelog | # changelog | ||||||
| changelogs: | changelogs: | ||||||
|  |   - { date: "22.11.22:", desc: "Pin certbot to 1.32.0 until plugin compatibility improves."} | ||||||
|   - { date: "05.11.22:", desc: "Update acmedns plugin handling."} |   - { date: "05.11.22:", desc: "Update acmedns plugin handling."} | ||||||
|   - { date: "06.10.22:", desc: "Switch to certbot-dns-duckdns. Update cpanel and gandi dns plugin handling. Minor adjustments to init logic." } |   - { date: "06.10.22:", desc: "Switch to certbot-dns-duckdns. Update cpanel and gandi dns plugin handling. Minor adjustments to init logic." } | ||||||
|   - { date: "05.10.22:", desc: "Use certbot file hooks instead of command line hooks" } |   - { date: "05.10.22:", desc: "Use certbot file hooks instead of command line hooks" } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user