Skip to content

Commit 0921171

Browse files
PMM-8306 Migrate OVA image to rootless container. (#2938)
* PMM-8306 Migrate OVA image to rootless container. * PMM-8306 try `docker compose` instead of `docker-compose` * PMM-8306 rename the step --------- Co-authored-by: Alex Demidoff <alexander.demidoff@percona.com>
1 parent 745531f commit 0921171

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

.github/workflows/agent.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Build and install
9595
run: make install
9696

97-
- name: Docker-compose
97+
- name: Launch the containers
9898
env:
9999
ENV_UP_FLAGS: "--detach"
100100
run: make env-up

agent/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ env-up: ## Start development environment
110110
mkdir -p testdata/mysql/slowlogs
111111
chmod -R 0777 testdata
112112

113-
docker-compose up $(ENV_UP_FLAGS)
113+
docker compose up $(ENV_UP_FLAGS)
114114

115115
env-down: ## Stop development environment
116-
docker-compose down --volumes --remove-orphans
116+
docker compose down --volumes --remove-orphans
117117

118118
setup-dev: install ## Run pmm-agent setup in development environment
119119
pmm-agent setup $(RUN_FLAGS) --server-insecure-tls --server-address=127.0.0.1:${PMM_DEV_SERVER_PORT} --server-username=admin --server-password=admin --paths-exporters_base=$(GOPATH)/bin --force
@@ -128,13 +128,13 @@ env-psql: ## Run psql client
128128
docker exec -ti pmm-agent_postgres env PGPASSWORD=pmm-agent-password psql --username=pmm-agent
129129

130130
env-sysbench-prepare:
131-
docker-compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
131+
docker compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
132132
--db-driver=pgsql --pgsql-host=postgres --pgsql-user=pmm-agent --pgsql-password=pmm-agent-password --pgsql-db=pmm-agent \
133133
--threads=1 --time=0 --report-interval=10 \
134134
--tables=1 --scale=10 --use_fk=0 --enable_purge=yes prepare
135135

136136
env-sysbench-run:
137-
docker-compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
137+
docker compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
138138
--db-driver=pgsql --pgsql-host=postgres --pgsql-user=pmm-agent --pgsql-password=pmm-agent-password --pgsql-db=pmm-agent \
139139
--threads=4 --time=0 --rate=10 --report-interval=10 --percentile=99 \
140140
--tables=1 --scale=10 --use_fk=0 --enable_purge=yes run

build/Makefile

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fetch:
99
-o ${PACKER_CACHE_DIR}/id_rsa_vagrant
1010
chmod 600 ${PACKER_CACHE_DIR}/id_rsa_vagrant
1111
test -f ${PACKER_CACHE_DIR}/box/oracle9.ova \
12-
|| curl -fL https://vagrantcloud.com/bento/boxes/oracle-9.0/versions/202207.20.0/providers/virtualbox.box -o ${PACKER_CACHE_DIR}/box/oracle9.ova
12+
|| curl -fL https://vagrantcloud.com/bento/boxes/oracle-9.3/versions/202401.31.0/providers/virtualbox.box -o ${PACKER_CACHE_DIR}/box/oracle9.ova
1313

1414
# NOTE: image from vagrant registry is twice as large
1515
test -f ${PACKER_CACHE_DIR}/box/box.ovf \
@@ -24,11 +24,6 @@ pmm-ovf: fetch
2424
/usr/bin/packer build \
2525
-only virtualbox-ovf -color=false packer/pmm.json | tee build.log
2626

27-
# NOTE: no difference between rc and dev-latest (i.e. pmm-ovf) ATM
28-
pmm-ovf-rc: fetch
29-
/usr/bin/packer build \
30-
-only virtualbox-ovf -color=false packer/pmm.json | tee build.log
31-
3227
pmm-digitalocean:
3328
packer build -only digitalocean -var 'single_disk=true' packer/pmm.json
3429

build/packer/pmm.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
},
6565
{
6666
"type": "virtualbox-ovf",
67-
"vm_name": "PMM-Server-EL9-{{isotime \"2006-01-02-1504\"}}",
67+
"vm_name": "PMM3-Server-{{isotime \"2006-01-02-1504\"}}",
6868
"export_opts": [
6969
"--ovf10",
7070
"--manifest",

0 commit comments

Comments
 (0)