Compare commits

..

2 Commits
2.8.0 ... 2.7.0

Author SHA1 Message Date
Dave Conroy
accb1acff3 Release 2.7.0 - See CHANGELOG.md 2021-06-17 07:36:28 -07:00
Dave Conroy
a183fcd16d Release 2.7.0 - See CHANGELOG.md 2021-06-17 07:23:25 -07:00
3 changed files with 11 additions and 20 deletions

View File

@@ -1,13 +1,3 @@
## 2.8.0 2021-08-27 <dave at tiredofit dot ca>
### Added
- Alpine 3.14 Base
### Changed
- Fix for syntax error in 2.7.0 Release (Credit the1ts@github)
- Cleanup image and leftover cache with AWS CLI installation
## 2.7.0 2021-06-17 <dave at tiredofit dot ca> ## 2.7.0 2021-06-17 <dave at tiredofit dot ca>
### Added ### Added

View File

@@ -1,4 +1,4 @@
FROM tiredofit/alpine:3.14 FROM tiredofit/alpine:3.13
### Set Environment Variables ### Set Environment Variables
ENV MSSQL_VERSION=17.5.2.1-1 \ ENV MSSQL_VERSION=17.5.2.1-1 \
@@ -16,7 +16,6 @@ RUN set -ex && \
bzip2-dev \ bzip2-dev \
git \ git \
libarchive-dev \ libarchive-dev \
py3-pip \
xz-dev \ xz-dev \
&& \ && \
\ \
@@ -30,7 +29,6 @@ RUN set -ex && \
pigz \ pigz \
postgresql \ postgresql \
postgresql-client \ postgresql-client \
python3 \
redis \ redis \
sqlite \ sqlite \
xz \ xz \
@@ -57,15 +55,19 @@ RUN set -ex && \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \
&& \ && \
make && \ make && \
make install && \ make install && \
pip3 install --upgrade pip && \ \
pip3 install awscli && \
\
### Cleanup ### Cleanup
apk del .db-backup-build-deps && \ apk del .db-backup-build-deps && \
rm -rf /usr/src/* && \ rm -rf /usr/src/* && \
rm -rf /root/.cache /tmp/* /var/cache/apk/* rm -rf /tmp/* /var/cache/apk/*
RUN apk add --no-cache \
python3 \
py3-pip \
&& pip3 install --upgrade pip \
&& pip3 install awscli
### S6 Setup ### S6 Setup
ADD install / ADD install /

View File

@@ -35,7 +35,6 @@ case "$dbtype" in
dbport=${DB_PORT:-27017} dbport=${DB_PORT:-27017}
[[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER' [[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER'
[[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS' [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
;;
"mysql" | "MYSQL" | "mariadb" | "MARIADB") "mysql" | "MYSQL" | "mariadb" | "MARIADB")
dbtype=mysql dbtype=mysql
dbport=${DB_PORT:-3306} dbport=${DB_PORT:-3306}