Compare commits
	
		
			37 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 584f7aa710 | |||
| 
						
						
							
						
						6d9eb25330
	
				 | 
					
					
						|||
| 
						
						
							
						
						940d25b0c2
	
				 | 
					
					
						|||
| 3ce730d822 | |||
| 7164c54074 | |||
| 3835b00832 | |||
| b49a13670c | |||
| 
						
						
							
						
						d1e7eb751a
	
				 | 
					
					
						|||
| 
						
						
							
						
						f1cdf753ab
	
				 | 
					
					
						|||
| 9fc7fa989e | |||
| 
						
						
							
						
						9376b65be5
	
				 | 
					
					
						|||
| 
						
						
							
						
						901bb7ce80
	
				 | 
					
					
						|||
| 
						
						
							
						
						9d8b22d4e9
	
				 | 
					
					
						|||
| 
						
						
							
						
						b970ebe600
	
				 | 
					
					
						|||
| 
						
						
							
						
						e4d5d5e448
	
				 | 
					
					
						|||
| 
						
						
							
						
						c30fd6eadb
	
				 | 
					
					
						|||
| 
						
						
							
						
						275c9cb8c6
	
				 | 
					
					
						|||
| 
						
						
							
						
						544398c895
	
				 | 
					
					
						|||
| 
						
						
							
						
						8bdc6d6a15
	
				 | 
					
					
						|||
| 
						
						
							
						
						1f76c43a2a
	
				 | 
					
					
						|||
| e85a2c6e93 | |||
| 
						
						
							
						
						131494a7d8
	
				 | 
					
					
						|||
| 
						
						
							
						
						72805144ed
	
				 | 
					
					
						|||
| 
						
						
							
						
						ae5fde95d9
	
				 | 
					
					
						|||
| 
						
						
							
						
						673c294e22
	
				 | 
					
					
						|||
| 
						
						
							
						
						d0d24eb332
	
				 | 
					
					
						|||
| 
						
						
							
						
						3aaefd971b
	
				 | 
					
					
						|||
| 
						
						
							
						
						081b57d97f
	
				 | 
					
					
						|||
| 
						
						
							
						
						bd053c289f
	
				 | 
					
					
						|||
| 
						
						
							
						
						5fe28253e0
	
				 | 
					
					
						|||
| 
						
						
							
						
						848e1b43a3
	
				 | 
					
					
						|||
| 468c347039 | |||
| 
						
						
							
						
						a5743662e1
	
				 | 
					
					
						|||
| 
						
						
							
						
						4a17547efb
	
				 | 
					
					
						|||
| 
						
						
							
						
						2e3970a6c6
	
				 | 
					
					
						|||
| 
						
						
							
						
						78a82af315
	
				 | 
					
					
						|||
| 
						
						
							
						
						2915d0ad18
	
				 | 
					
					
						
							
								
								
									
										106
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										106
									
								
								.drone.yml
									
									
									
									
									
								
							@@ -12,12 +12,61 @@ get:
 | 
				
			|||||||
  path: odit-registry-builder
 | 
					  path: odit-registry-builder
 | 
				
			||||||
  name: password
 | 
					  name: password
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					kind: secret
 | 
				
			||||||
 | 
					name: gitea_token
 | 
				
			||||||
 | 
					get:
 | 
				
			||||||
 | 
					  path: odit-git-bot
 | 
				
			||||||
 | 
					  name: apikey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					kind: secret
 | 
				
			||||||
 | 
					name: git_ssh
 | 
				
			||||||
 | 
					get:
 | 
				
			||||||
 | 
					  path: odit-git-bot
 | 
				
			||||||
 | 
					  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
 | 
				
			||||||
 | 
					    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:patch
 | 
				
			||||||
 | 
					      - 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
 | 
				
			||||||
    depends_on: [clone]
 | 
					    depends_on: [clone]
 | 
				
			||||||
@@ -32,17 +81,15 @@ steps:
 | 
				
			|||||||
        - latest
 | 
					        - latest
 | 
				
			||||||
      registry: registry.odit.services
 | 
					      registry: registry.odit.services
 | 
				
			||||||
      mtu: 1000
 | 
					      mtu: 1000
 | 
				
			||||||
    when:
 | 
					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]
 | 
				
			||||||
@@ -56,15 +103,30 @@ steps:
 | 
				
			|||||||
        - "${DRONE_TAG}"
 | 
					        - "${DRONE_TAG}"
 | 
				
			||||||
      registry: registry.odit.services
 | 
					      registry: registry.odit.services
 | 
				
			||||||
      mtu: 1000
 | 
					      mtu: 1000
 | 
				
			||||||
 | 
					  - name: sign_image
 | 
				
			||||||
 | 
					    image: registry.odit.services/hub/library/alpine:edge
 | 
				
			||||||
 | 
					    depends_on: [build_tag]
 | 
				
			||||||
 | 
					    commands:
 | 
				
			||||||
 | 
					      - apk add cosign docker
 | 
				
			||||||
 | 
					      - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
 | 
				
			||||||
 | 
					      - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin
 | 
				
			||||||
 | 
					      - "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
 | 
				
			||||||
@@ -88,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_prepatch]
 | 
				
			||||||
 | 
					    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
 | 
				
			||||||
@@ -118,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
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,2 @@
 | 
				
			|||||||
 | 
					package-lock.json
 | 
				
			||||||
 | 
					node_modules
 | 
				
			||||||
							
								
								
									
										33
									
								
								package.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								package.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					  "name": "nginx-brotli",
 | 
				
			||||||
 | 
					  "version": "3.15.7",
 | 
				
			||||||
 | 
					  "description": "NGINX Base Image feat. brotli",
 | 
				
			||||||
 | 
					  "repository": {
 | 
				
			||||||
 | 
					    "type": "git",
 | 
				
			||||||
 | 
					    "url": "git@git.odit.services:odit/nginx-brotli.git"
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "license": "MIT",
 | 
				
			||||||
 | 
					  "devDependencies": {
 | 
				
			||||||
 | 
					    "release-it": "^15.0.0"
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "scripts": {
 | 
				
			||||||
 | 
					    "release:patch": "release-it --patch --ci",
 | 
				
			||||||
 | 
					    "release:prepatch": "release-it --prePatch --preRelease --ci"
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "release-it": {
 | 
				
			||||||
 | 
					    "git": {
 | 
				
			||||||
 | 
					      "commit": true,
 | 
				
			||||||
 | 
					      "requireCleanWorkingDir": false,
 | 
				
			||||||
 | 
					      "requireUpstream": false,
 | 
				
			||||||
 | 
					      "requireBranch": "main",
 | 
				
			||||||
 | 
					      "commitMessage": "🚀RELEASE ${version} [CI SKIP]",
 | 
				
			||||||
 | 
					      "push": false,
 | 
				
			||||||
 | 
					      "tag": true,
 | 
				
			||||||
 | 
					      "tagName": "${version}",
 | 
				
			||||||
 | 
					      "tagAnnotation": "${version}"
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "npm": {
 | 
				
			||||||
 | 
					      "publish": false
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user