Debian 12, new version of everything, switch to task
Some checks reported errors
continuous-integration/drone Build encountered an error
Some checks reported errors
continuous-integration/drone Build encountered an error
This commit is contained in:
parent
2c9ee0c3a7
commit
82c648b7cd
4 changed files with 63 additions and 26 deletions
10
.drone.yml
10
.drone.yml
|
@ -4,7 +4,7 @@ name: image building
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build&push squashed image
|
- name: build&push squashed image
|
||||||
image: harbor.hq.rosti.cz/library/builder:35
|
image: harbor.hq.rosti.cz/library/builder:38
|
||||||
environment:
|
environment:
|
||||||
username: robot$rosti+rosti
|
username: robot$rosti+rosti
|
||||||
password:
|
password:
|
||||||
|
@ -13,7 +13,7 @@ steps:
|
||||||
privileged: true
|
privileged: true
|
||||||
commands:
|
commands:
|
||||||
- echo "$password" | podman login -u $username --password-stdin $repo
|
- echo "$password" | podman login -u $username --password-stdin $repo
|
||||||
- make DOCKER=podman push
|
- task push
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
|
@ -29,7 +29,7 @@ name: test image
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: test build
|
- name: test build
|
||||||
image: harbor.hq.rosti.cz/library/builder:35
|
image: harbor.hq.rosti.cz/library/builder:38
|
||||||
environment:
|
environment:
|
||||||
username: robot$rosti+rosti
|
username: robot$rosti+rosti
|
||||||
password:
|
password:
|
||||||
|
@ -38,8 +38,8 @@ steps:
|
||||||
privileged: true
|
privileged: true
|
||||||
commands:
|
commands:
|
||||||
- echo "$password" | podman login -u $username --password-stdin $repo
|
- echo "$password" | podman login -u $username --password-stdin $repo
|
||||||
- make VERSION=test DOCKER=podman build
|
- task build VERSION=test
|
||||||
- make DOCKER=podman VERSION=test test
|
- task testVERSION=test
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
|
|
36
Dockerfile
36
Dockerfile
|
@ -44,42 +44,38 @@ ENV TERM xterm
|
||||||
## Node.js
|
## Node.js
|
||||||
WORKDIR /usr/src
|
WORKDIR /usr/src
|
||||||
ADD build_node.sh /usr/local/bin/build_node.sh
|
ADD build_node.sh /usr/local/bin/build_node.sh
|
||||||
# 2023/04
|
# 2023/08
|
||||||
RUN build_node.sh 16.19.0
|
RUN build_node.sh 16.20.2
|
||||||
RUN build_node.sh 17.9.1
|
RUN build_node.sh 17.9.1
|
||||||
RUN build_node.sh 18.12.1
|
|
||||||
RUN build_node.sh 18.15.0
|
|
||||||
RUN build_node.sh 19.6.0
|
|
||||||
RUN build_node.sh 19.9.0
|
RUN build_node.sh 19.9.0
|
||||||
|
RUN build_node.sh 18.17.1
|
||||||
|
RUN build_node.sh 20.5.1
|
||||||
|
|
||||||
## Python
|
## Python
|
||||||
WORKDIR /usr/src
|
WORKDIR /usr/src
|
||||||
ADD build_python.sh /usr/local/bin/build_python.sh
|
ADD build_python.sh /usr/local/bin/build_python.sh
|
||||||
# 2023/04
|
# 2023/08
|
||||||
RUN build_python.sh 3.9.16
|
RUN build_python.sh 3.9.17
|
||||||
RUN build_python.sh 3.10.11
|
RUN build_python.sh 3.10.12
|
||||||
RUN build_python.sh 3.11.3
|
RUN build_python.sh 3.11.4
|
||||||
|
|
||||||
## PHP 8
|
## PHP 8
|
||||||
ADD build_php8.sh /usr/local/bin/build_php8.sh
|
ADD build_php8.sh /usr/local/bin/build_php8.sh
|
||||||
# 2023/04
|
# 2023/08
|
||||||
RUN build_php8.sh 8.1.13
|
RUN build_php8.sh 8.1.21
|
||||||
RUN build_php8.sh 8.1.16
|
RUN build_php8.sh 8.2.7
|
||||||
RUN build_php8.sh 8.2.1
|
|
||||||
RUN build_php8.sh 8.2.3
|
|
||||||
|
|
||||||
## Ruby
|
## Ruby
|
||||||
WORKDIR /usr/src
|
WORKDIR /usr/src
|
||||||
ADD build_ruby.sh /usr/local/bin/build_ruby.sh
|
ADD build_ruby.sh /usr/local/bin/build_ruby.sh
|
||||||
# 2022/12
|
# 2023/08
|
||||||
RUN build_ruby.sh 3.1.3
|
RUN build_ruby.sh 3.1.4
|
||||||
RUN build_ruby.sh 3.2.0
|
RUN build_ruby.sh 3.2.2
|
||||||
|
|
||||||
## Deno
|
## Deno
|
||||||
ADD build_deno.sh /usr/local/bin/build_deno.sh
|
ADD build_deno.sh /usr/local/bin/build_deno.sh
|
||||||
# 2023/04
|
# 2023/08
|
||||||
RUN build_deno.sh 1.30.1
|
RUN build_deno.sh 1.36.1
|
||||||
RUN build_deno.sh 1.32.3
|
|
||||||
|
|
||||||
#############
|
#############
|
||||||
|
|
||||||
|
|
3
Makefile
3
Makefile
|
@ -1,6 +1,7 @@
|
||||||
|
# TODO: Unnecessary, remo this file
|
||||||
REPO=harbor.hq.rosti.cz/rosti/runtime
|
REPO=harbor.hq.rosti.cz/rosti/runtime
|
||||||
DOCKER=docker
|
DOCKER=docker
|
||||||
VERSION=2023.06-1
|
VERSION=2023.08-1
|
||||||
BASEIMAGE=debian:11
|
BASEIMAGE=debian:11
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
40
Taskfile.yml
Normal file
40
Taskfile.yml
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
# https://taskfile.dev
|
||||||
|
|
||||||
|
version: '3'
|
||||||
|
|
||||||
|
vars:
|
||||||
|
GREETING: Hello, World!
|
||||||
|
REPO: harbor.hq.rosti.cz/rosti/runtime
|
||||||
|
VERSION: 2023.08-1
|
||||||
|
BASEIMAGE: debian:bookworm
|
||||||
|
|
||||||
|
tasks:
|
||||||
|
default:
|
||||||
|
deps:
|
||||||
|
- build
|
||||||
|
|
||||||
|
build:
|
||||||
|
cmds:
|
||||||
|
- docker pull {{ .BASEIMAGE }}
|
||||||
|
- docker build -t {{ .REPO }}:dev .
|
||||||
|
- docker tag {{ .REPO }}:dev {{ .REPO }}:{{ .VERSION }}
|
||||||
|
- echo "JSON for admin:"
|
||||||
|
- python generate_versions.py
|
||||||
|
|
||||||
|
test:
|
||||||
|
cmds:
|
||||||
|
- bash ./tests2.sh {{ .REPO }}:{{ .VERSION }}
|
||||||
|
|
||||||
|
squashed:
|
||||||
|
cmds:
|
||||||
|
- docker pull {{ .BASEIMAGE }}
|
||||||
|
- docker build --squash -t {{ .REPO }}:dev-squashed .
|
||||||
|
- docker tag {{ .REPO }}:dev-squashed {{ .REPO }}:{{ .VERSION }}
|
||||||
|
- echo "JSON for admin:"
|
||||||
|
- python generate_versions.py
|
||||||
|
|
||||||
|
push:
|
||||||
|
cmds:
|
||||||
|
- docker push {{ .REPO }}:{{ .VERSION }}
|
||||||
|
deps:
|
||||||
|
- squashed
|
Loading…
Reference in a new issue