Skip to content

Commit 8d9f347

Browse files
author
Sam Kottler
authored
Merge pull request mysql#3 from planetscale/build-improvements
Move install process into Dockerfile
2 parents 49b73da + a16eed5 commit 8d9f347

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ steps:
2323

2424
- name: "Build runtime mysql-server container"
2525
label: ":docker: Build runtime container"
26-
command: bash install.sh
26+
command: "/usr/bin/mysqld -V"
2727
plugins:
2828
- ecr#v2.3.0:
2929
login: true

Dockerfile.release

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ RUN apt-get update && apt-get upgrade -y
44

55
ENV DEBIAN_FRONTEND noninteractive
66

7-
ADD install.sh /src/install.sh
8-
WORKDIR /src
9-
107
RUN apt-get install -y \
118
libaio1 \
129
libnuma1 \
1310
binutils
11+
12+
ADD dist/ /dist
13+
14+
RUN tar -xzvf /dist/mysql-8.0.28-linux-x86_64.tar.gz -C /usr --strip-components=1 && strip /usr/bin/mysql* || true && rm -rf /dist/*.tar.gz
15+
RUN apt-get remove -y binutils && apt-get autoremove -y
16+
RUN rm -rf /usr/mysql-test

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ services:
1414
dockerfile: Dockerfile.release
1515
environment:
1616
- BUILDKITE_BRANCH=${BUILDKITE_BRANCH}
17-
volumes:
18-
- "./dist:/dist"

install.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)