Compare commits
	
		
			14 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b49a13670c | |||
| 
						
						
							
						
						d1e7eb751a
	
				 | 
					
					
						|||
| 
						
						
							
						
						f1cdf753ab
	
				 | 
					
					
						|||
| 9fc7fa989e | |||
| 
						
						
							
						
						9376b65be5
	
				 | 
					
					
						|||
| 
						
						
							
						
						901bb7ce80
	
				 | 
					
					
						|||
| 
						
						
							
						
						9d8b22d4e9
	
				 | 
					
					
						|||
| 
						
						
							
						
						b970ebe600
	
				 | 
					
					
						|||
| 
						
						
							
						
						e4d5d5e448
	
				 | 
					
					
						|||
| 
						
						
							
						
						c30fd6eadb
	
				 | 
					
					
						|||
| 
						
						
							
						
						275c9cb8c6
	
				 | 
					
					
						|||
| 
						
						
							
						
						544398c895
	
				 | 
					
					
						|||
| 
						
						
							
						
						8bdc6d6a15
	
				 | 
					
					
						|||
| 
						
						
							
						
						1f76c43a2a
	
				 | 
					
					
						
							
								
								
									
										74
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										74
									
								
								.drone.yml
									
									
									
									
									
								
							@@ -26,11 +26,24 @@ get:
 | 
				
			|||||||
  path: odit-git-bot
 | 
					  path: odit-git-bot
 | 
				
			||||||
  name: sshkey
 | 
					  name: sshkey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					kind: secret
 | 
				
			||||||
 | 
					name: cosign_key
 | 
				
			||||||
 | 
					get:
 | 
				
			||||||
 | 
					  path: cosign
 | 
				
			||||||
 | 
					  name: cosign.key
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					kind: secret
 | 
				
			||||||
 | 
					name: cosign_password
 | 
				
			||||||
 | 
					get:
 | 
				
			||||||
 | 
					  path: cosign
 | 
				
			||||||
 | 
					  name: cosign.password
 | 
				
			||||||
 | 
					
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
type: kubernetes
 | 
					type: kubernetes
 | 
				
			||||||
name: build:latest
 | 
					name: build:latest
 | 
				
			||||||
 | 
					 | 
				
			||||||
steps:
 | 
					steps:
 | 
				
			||||||
  - name: bump_patch
 | 
					  - name: bump_patch
 | 
				
			||||||
    depends_on: [clone]
 | 
					    depends_on: [clone]
 | 
				
			||||||
@@ -40,7 +53,7 @@ steps:
 | 
				
			|||||||
      - git config --global push.default current
 | 
					      - git config --global push.default current
 | 
				
			||||||
      - git branch --set-upstream-to=origin/main main
 | 
					      - git branch --set-upstream-to=origin/main main
 | 
				
			||||||
      - yarn
 | 
					      - yarn
 | 
				
			||||||
      - yarn release
 | 
					      - yarn release:patch
 | 
				
			||||||
      - git pull
 | 
					      - git pull
 | 
				
			||||||
  - name: push to repo
 | 
					  - name: push to repo
 | 
				
			||||||
    image: appleboy/drone-git-push
 | 
					    image: appleboy/drone-git-push
 | 
				
			||||||
@@ -71,14 +84,12 @@ steps:
 | 
				
			|||||||
trigger:
 | 
					trigger:
 | 
				
			||||||
  branch:
 | 
					  branch:
 | 
				
			||||||
    - main
 | 
					    - main
 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
type: kubernetes
 | 
					type: kubernetes
 | 
				
			||||||
name: build:tags
 | 
					name: build:tags
 | 
				
			||||||
 | 
					 | 
				
			||||||
steps:
 | 
					steps:
 | 
				
			||||||
  - name: build $DRONE_TAG
 | 
					  - name: build_tag
 | 
				
			||||||
    image: plugins/docker
 | 
					    image: plugins/docker
 | 
				
			||||||
    user: 0
 | 
					    user: 0
 | 
				
			||||||
    depends_on: [clone]
 | 
					    depends_on: [clone]
 | 
				
			||||||
@@ -92,23 +103,30 @@ steps:
 | 
				
			|||||||
        - "${DRONE_TAG}"
 | 
					        - "${DRONE_TAG}"
 | 
				
			||||||
      registry: registry.odit.services
 | 
					      registry: registry.odit.services
 | 
				
			||||||
      mtu: 1000
 | 
					      mtu: 1000
 | 
				
			||||||
  - name: gitea_release
 | 
					  - name: sign_image
 | 
				
			||||||
    image: plugins/gitea-release
 | 
					    image: registry.odit.services/hub/library/alpine:edge
 | 
				
			||||||
    settings:
 | 
					    depends_on: [build_tag]
 | 
				
			||||||
      title: Release ${DRONE_TAG}
 | 
					    commands:
 | 
				
			||||||
      note: "Pull: `docker pull registry.odit.services/library/nginx-brotli:${DRONE_TAG}`"
 | 
					      - apk add cosign docker
 | 
				
			||||||
      api_key:
 | 
					      - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
 | 
				
			||||||
        from_secret: gitea_token
 | 
					      - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin
 | 
				
			||||||
      base_url: https://git.odit.services
 | 
					      - "cosign sign --key cosign.key registry.odit.services/library/nginx-brotli:${DRONE_TAG}"
 | 
				
			||||||
 | 
					    environment:
 | 
				
			||||||
 | 
					      COSIGN_KEY:
 | 
				
			||||||
 | 
					        from_secret: cosign_key
 | 
				
			||||||
 | 
					      COSIGN_PASSWORD:
 | 
				
			||||||
 | 
					        from_secret: cosign_password
 | 
				
			||||||
 | 
					      DOCKER_PASSWORD:
 | 
				
			||||||
 | 
					        from_secret: docker_password
 | 
				
			||||||
 | 
					      DOCKER_USERNAME:
 | 
				
			||||||
 | 
					        from_secret: docker_username
 | 
				
			||||||
trigger:
 | 
					trigger:
 | 
				
			||||||
  event:
 | 
					  event:
 | 
				
			||||||
    - tag
 | 
					    - tag
 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
type: kubernetes
 | 
					type: kubernetes
 | 
				
			||||||
name: build:nightly
 | 
					name: build:nightly
 | 
				
			||||||
 | 
					 | 
				
			||||||
steps:
 | 
					steps:
 | 
				
			||||||
  - name: docker release
 | 
					  - name: docker release
 | 
				
			||||||
    image: plugins/docker
 | 
					    image: plugins/docker
 | 
				
			||||||
@@ -132,13 +150,33 @@ trigger:
 | 
				
			|||||||
  cron:
 | 
					  cron:
 | 
				
			||||||
    include:
 | 
					    include:
 | 
				
			||||||
      - nightly
 | 
					      - nightly
 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
type: kubernetes
 | 
					type: kubernetes
 | 
				
			||||||
name: build:weekly
 | 
					name: build:weekly
 | 
				
			||||||
 | 
					 | 
				
			||||||
steps:
 | 
					steps:
 | 
				
			||||||
 | 
					  - name: bump_prepatch
 | 
				
			||||||
 | 
					    depends_on: [clone]
 | 
				
			||||||
 | 
					    image: registry.odit.services/hub/library/node:18.1.0-alpine3.15
 | 
				
			||||||
 | 
					    commands:
 | 
				
			||||||
 | 
					      - apk add git
 | 
				
			||||||
 | 
					      - git config --global push.default current
 | 
				
			||||||
 | 
					      - git branch --set-upstream-to=origin/main main
 | 
				
			||||||
 | 
					      - yarn
 | 
				
			||||||
 | 
					      - "yarn release:prepatch"
 | 
				
			||||||
 | 
					      - git pull
 | 
				
			||||||
 | 
					  - name: push to repo
 | 
				
			||||||
 | 
					    image: appleboy/drone-git-push
 | 
				
			||||||
 | 
					    depends_on: [bump_patch]
 | 
				
			||||||
 | 
					    settings:
 | 
				
			||||||
 | 
					      commit: false
 | 
				
			||||||
 | 
					      author_email: bot@odit.services
 | 
				
			||||||
 | 
					      followtags: true
 | 
				
			||||||
 | 
					      branch: main
 | 
				
			||||||
 | 
					      remote: git@git.odit.services:odit/nginx-brotli.git
 | 
				
			||||||
 | 
					      skip_verify: true
 | 
				
			||||||
 | 
					      ssh_key:
 | 
				
			||||||
 | 
					        from_secret: git_ssh
 | 
				
			||||||
  - name: docker release
 | 
					  - name: docker release
 | 
				
			||||||
    image: plugins/docker
 | 
					    image: plugins/docker
 | 
				
			||||||
    user: 0
 | 
					    user: 0
 | 
				
			||||||
@@ -162,12 +200,10 @@ trigger:
 | 
				
			|||||||
  cron:
 | 
					  cron:
 | 
				
			||||||
    include:
 | 
					    include:
 | 
				
			||||||
      - weekly
 | 
					      - weekly
 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
type: kubernetes
 | 
					type: kubernetes
 | 
				
			||||||
name: build:pr
 | 
					name: build:pr
 | 
				
			||||||
 | 
					 | 
				
			||||||
steps:
 | 
					steps:
 | 
				
			||||||
  - name: docker release
 | 
					  - name: docker release
 | 
				
			||||||
    image: plugins/docker
 | 
					    image: plugins/docker
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "nginx-brotli",
 | 
					  "name": "nginx-brotli",
 | 
				
			||||||
  "version": "3.15.1",
 | 
					  "version": "3.15.3",
 | 
				
			||||||
  "description": "NGINX Base Image feat. brotli",
 | 
					  "description": "NGINX Base Image feat. brotli",
 | 
				
			||||||
  "repository": {
 | 
					  "repository": {
 | 
				
			||||||
    "type": "git",
 | 
					    "type": "git",
 | 
				
			||||||
@@ -11,7 +11,8 @@
 | 
				
			|||||||
    "release-it": "^15.0.0"
 | 
					    "release-it": "^15.0.0"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "scripts": {
 | 
					  "scripts": {
 | 
				
			||||||
    "release": "release-it --patch --ci"
 | 
					    "release:patch": "release-it --patch --ci",
 | 
				
			||||||
 | 
					    "release:prepatch": "release-it --prePatch --preRelease --ci"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "release-it": {
 | 
					  "release-it": {
 | 
				
			||||||
    "git": {
 | 
					    "git": {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user