fix: build

This commit is contained in:
mc1 2021-03-08 14:35:51 +01:00 committed by Silthus
parent 8547e72fbd
commit 54815fa73f
5 changed files with 25 additions and 23 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "src/mydumper"]
path = src/mydumper
url = https://github.com/maxbube/mydumper.git

View File

@ -4,7 +4,6 @@ services:
build: ./src
env_file:
- restic_compose_backup.env
- alerts.env
labels:
restic-compose-backup.volumes: true
restic-compose-backup.volumes.include: 'src'

View File

@ -11,25 +11,6 @@ ADD https://github.com/itzg/rcon-cli/releases/download/${RCON_CLI_VERSION}/rcon-
RUN tar x -f /tmp/rcon-cli.tar.gz -C /opt/ && \
chmod +x /opt/rcon-cli
RUN apk -U --no-cache add \
build-base \
build-dependencies \
gcc \
wget \
git \
curl \
openssl-dev \
mariadb-dev \
makec
ADD mydumper /usr/src/
WORKDIR /usr/src
RUN \
cmake . && \
make && \
make install
FROM restic/restic
RUN apk -U --no-cache add \
@ -41,8 +22,27 @@ RUN apk -U --no-cache add \
mariadb-client \
postgresql-client
RUN apk -U --no-cache add \
build-base \
gcc \
wget \
git \
curl \
openssl-dev \
mariadb-dev \
cmake \
glib-dev \
zlib-dev \
pcre-dev
ADD mydumper /usr/src/
WORKDIR /usr/src
RUN cmake . && \
make && \
make install
COPY --from=builder /opt/rcon-cli /opt/rcon-cli
COPY --from=builder /usr/bin/mydumper /usr/bin/mydumper
RUN ln -s /opt/rcon-cli /usr/bin
@ -51,7 +51,7 @@ RUN ln -s /opt/rcon-cli /usr/bin
ADD . /restic-compose-backup
WORKDIR /restic-compose-backup
RUN pip3 install -U pip setuptools wheel && pip3 install -e .
RUN pip install -U pip setuptools wheel && pip install -e .
ENV XDG_CACHE_HOME=/cache
# end install

1
src/mydumper Submodule

@ -0,0 +1 @@
Subproject commit 1fabdf87e3007e5934227b504ad673ba3697946c

View File

@ -131,7 +131,6 @@ class MysqlContainer(Container):
destination /= project_name
destination /= self.service_name
destination /= "all_databases.sql"
return destination