Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6aae1c80e4 | |||
| 1c5dc6cb12 | |||
| ff53a85323 | |||
| fb0573cbae |
@@ -1,3 +0,0 @@
|
|||||||
/**
|
|
||||||
!Dockerfile
|
|
||||||
!entrypoint.sh
|
|
||||||
+24
-6
@@ -20,7 +20,7 @@
|
|||||||
*.PDF diff=astextplain
|
*.PDF diff=astextplain
|
||||||
*.rtf diff=astextplain
|
*.rtf diff=astextplain
|
||||||
*.RTF diff=astextplain
|
*.RTF diff=astextplain
|
||||||
*.md text
|
*.md text diff=markdown
|
||||||
*.tex text diff=tex
|
*.tex text diff=tex
|
||||||
*.adoc text
|
*.adoc text
|
||||||
*.textile text
|
*.textile text
|
||||||
@@ -30,6 +30,7 @@
|
|||||||
*.tsv text
|
*.tsv text
|
||||||
*.txt text
|
*.txt text
|
||||||
*.sql text
|
*.sql text
|
||||||
|
*.ps1 text eol=crlf
|
||||||
|
|
||||||
# Graphics
|
# Graphics
|
||||||
*.png binary
|
*.png binary
|
||||||
@@ -53,7 +54,23 @@
|
|||||||
# These are explicitly windows files and should use crlf
|
# These are explicitly windows files and should use crlf
|
||||||
*.bat text eol=crlf
|
*.bat text eol=crlf
|
||||||
*.cmd text eol=crlf
|
*.cmd text eol=crlf
|
||||||
*.ps1 text eol=crlf
|
|
||||||
|
# web frontend stack -- force LF so SRI hashes are always correct
|
||||||
|
*.html text eol=lf
|
||||||
|
*.htm text eol=lf
|
||||||
|
*.css text eol=lf
|
||||||
|
*.min.css text eol=lf
|
||||||
|
*.js text eol=lf
|
||||||
|
*.min.js text eol=lf
|
||||||
|
*.php text eol=lf
|
||||||
|
|
||||||
|
# Visual Studio projects (Rider also)
|
||||||
|
*.cs diff=csharp
|
||||||
|
*.sln merge=union
|
||||||
|
*.csproj merge=union
|
||||||
|
*.vbproj merge=union
|
||||||
|
*.fsproj merge=union
|
||||||
|
*.dbproj merge=union
|
||||||
|
|
||||||
# Serialisation
|
# Serialisation
|
||||||
*.json text
|
*.json text
|
||||||
@@ -76,7 +93,8 @@
|
|||||||
# Exclude files from exporting
|
# Exclude files from exporting
|
||||||
#
|
#
|
||||||
|
|
||||||
.gitattributes export-ignore
|
.gitattributes export-ignore
|
||||||
.gitignore export-ignore
|
.gitignore export-ignore
|
||||||
.gitkeep export-ignore
|
.gitkeep export-ignore
|
||||||
.vscode export-ignore
|
.idea export-ignore
|
||||||
|
.vscode export-ignore
|
||||||
|
|||||||
+72
-10
@@ -1,11 +1,73 @@
|
|||||||
# VSCode files
|
### JetBrains template
|
||||||
.vscode/*
|
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||||
!.vscode/settings.json
|
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||||
!.vscode/tasks.json
|
|
||||||
!.vscode/launch.json
|
# User-specific stuff
|
||||||
!.vscode/extensions.json
|
.idea/**/workspace.xml
|
||||||
!.vscode/numbered-bookmarks.json
|
.idea/**/tasks.xml
|
||||||
*.code-workspace
|
.idea/**/usage.statistics.xml
|
||||||
|
.idea/**/dictionaries
|
||||||
|
.idea/**/shelf
|
||||||
|
|
||||||
|
# Generated files
|
||||||
|
.idea/**/contentModel.xml
|
||||||
|
|
||||||
|
# Sensitive or high-churn files
|
||||||
|
.idea/**/dataSources/
|
||||||
|
.idea/**/dataSources.ids
|
||||||
|
.idea/**/dataSources.local.xml
|
||||||
|
.idea/**/sqlDataSources.xml
|
||||||
|
.idea/**/dynamic.xml
|
||||||
|
.idea/**/uiDesigner.xml
|
||||||
|
.idea/**/dbnavigator.xml
|
||||||
|
|
||||||
|
# Gradle
|
||||||
|
.idea/**/gradle.xml
|
||||||
|
.idea/**/libraries
|
||||||
|
|
||||||
|
# Gradle and Maven with auto-import
|
||||||
|
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||||
|
# since they will be recreated, and may cause churn. Uncomment if using
|
||||||
|
# auto-import.
|
||||||
|
# .idea/artifacts
|
||||||
|
# .idea/compiler.xml
|
||||||
|
# .idea/jarRepositories.xml
|
||||||
|
# .idea/modules.xml
|
||||||
|
# .idea/*.iml
|
||||||
|
# .idea/modules
|
||||||
|
# *.iml
|
||||||
|
# *.ipr
|
||||||
|
|
||||||
|
# CMake
|
||||||
|
cmake-build-*/
|
||||||
|
|
||||||
|
# Mongo Explorer plugin
|
||||||
|
.idea/**/mongoSettings.xml
|
||||||
|
|
||||||
|
# File-based project format
|
||||||
|
*.iws
|
||||||
|
|
||||||
|
# IntelliJ
|
||||||
|
out/
|
||||||
|
|
||||||
|
# mpeltonen/sbt-idea plugin
|
||||||
|
.idea_modules/
|
||||||
|
|
||||||
|
# JIRA plugin
|
||||||
|
atlassian-ide-plugin.xml
|
||||||
|
|
||||||
|
# Cursive Clojure plugin
|
||||||
|
.idea/replstate.xml
|
||||||
|
|
||||||
|
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||||
|
com_crashlytics_export_strings.xml
|
||||||
|
crashlytics.properties
|
||||||
|
crashlytics-build.properties
|
||||||
|
fabric.properties
|
||||||
|
|
||||||
|
# Editor-based Rest Client
|
||||||
|
.idea/httpRequests
|
||||||
|
|
||||||
|
# Android studio 3.1+ serialized cache file
|
||||||
|
.idea/caches/build_file_checksums.ser
|
||||||
|
|
||||||
# Local History for Visual Studio Code
|
|
||||||
.history/
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="GitToolBoxProjectSettings">
|
|
||||||
<option name="commitMessageIssueKeyValidationOverride">
|
|
||||||
<BoolValueOverride>
|
|
||||||
<option name="enabled" value="true" />
|
|
||||||
</BoolValueOverride>
|
|
||||||
</option>
|
|
||||||
<option name="commitMessageValidationConfigOverride">
|
|
||||||
<CommitMessageValidationOverride>
|
|
||||||
<option name="enabled" value="true" />
|
|
||||||
</CommitMessageValidationOverride>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="MarkdownSettings">
|
|
||||||
<enabledExtensions>
|
|
||||||
<entry key="MermaidLanguageExtension" value="false" />
|
|
||||||
<entry key="PlantUMLLanguageExtension" value="false" />
|
|
||||||
</enabledExtensions>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="RIDER_MODULE" version="4">
|
|
||||||
<component name="NewModuleRootManager">
|
|
||||||
<content url="file://$MODULE_DIR$/../.." />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker LOCAL">
|
|
||||||
<deployment type="dockerfile">
|
|
||||||
<settings>
|
|
||||||
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.5.13" />
|
|
||||||
<option name="buildArgs">
|
|
||||||
<list>
|
|
||||||
<DockerEnvVarImpl>
|
|
||||||
<option name="name" value="INTERNAL_VERSION" />
|
|
||||||
<option name="value" value="1.2" />
|
|
||||||
</DockerEnvVarImpl>
|
|
||||||
<DockerEnvVarImpl>
|
|
||||||
<option name="name" value="GIT_COMMIT" />
|
|
||||||
<option name="value" value="af07af2015" />
|
|
||||||
</DockerEnvVarImpl>
|
|
||||||
<DockerEnvVarImpl>
|
|
||||||
<option name="name" value="BUILD_DATE" />
|
|
||||||
<option name="value" value="2022-02-19" />
|
|
||||||
</DockerEnvVarImpl>
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="buildOnly" value="true" />
|
|
||||||
<option name="sourceFilePath" value="Dockerfile" />
|
|
||||||
</settings>
|
|
||||||
</deployment>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
+18
-14
@@ -1,20 +1,14 @@
|
|||||||
#
|
#
|
||||||
# mariadb running on Alpine Linux
|
### mariadb running on Alpine Linux
|
||||||
#
|
#
|
||||||
|
|
||||||
# version arguments
|
FROM alpine:3.14
|
||||||
ARG ALPINE_VERSION="3.14"
|
|
||||||
ARG MARIADB_VERSION="10.5.13-r0"
|
|
||||||
|
|
||||||
FROM alpine:${ALPINE_VERSION}
|
|
||||||
ARG ALPINE_VERSION
|
|
||||||
ARG MARIADB_VERSION
|
|
||||||
|
|
||||||
# standardized labels
|
# standardized labels
|
||||||
MAINTAINER Asif Bacchus <asif@asifbacchus.dev>
|
MAINTAINER Asif Bacchus <asif@asifbacchus.dev>
|
||||||
LABEL dev.asifbacchus.docker.internalName="ab-mariadb-alpine"
|
LABEL dev.asifbacchus.docker.internalName="ab-mariadb-alpine"
|
||||||
LABEL org.opencontainer.image.authors="Asif Bacchus <asif@asifbacchus.dev>"
|
LABEL org.opencontainer.image.authors="Asif Bacchus <asif@asifbacchus.dev>"
|
||||||
LABEL org.opencontainer.image.description="Mariadb on Alpine Linux."
|
LABEL org.opencontainer.image.description=""
|
||||||
LABEL org.opencontainer.image.documentation="https://git.asifbacchus.dev/ab-docker/ab-mariadb-alpine/raw/branch/main/README.md"
|
LABEL org.opencontainer.image.documentation="https://git.asifbacchus.dev/ab-docker/ab-mariadb-alpine/raw/branch/main/README.md"
|
||||||
LABEL org.opencontainer.image.source="https://git.asifbacchus.dev/ab-docker/ab-mariadb-alpine.git"
|
LABEL org.opencontainer.image.source="https://git.asifbacchus.dev/ab-docker/ab-mariadb-alpine.git"
|
||||||
LABEL org.opencontainer.image.title="ab-mariadb-alpine"
|
LABEL org.opencontainer.image.title="ab-mariadb-alpine"
|
||||||
@@ -22,12 +16,12 @@ LABEL org.opencontainer.image.url="https://git.asifbacchus.dev/ab-docker/ab-mari
|
|||||||
LABEL org.opencontainer.image.vendor="Asif Bacchus <asif@asifbacchus.dev>"
|
LABEL org.opencontainer.image.vendor="Asif Bacchus <asif@asifbacchus.dev>"
|
||||||
|
|
||||||
# install mariadb and turn on TCP connection in default config
|
# install mariadb and turn on TCP connection in default config
|
||||||
RUN apk --no-cache --update add \
|
RUN apk --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main add \
|
||||||
tzdata \
|
tzdata \
|
||||||
mariadb>${MARIADB_VERSION} \
|
mariadb \
|
||||||
mariadb-client>${MARIADB_VERSION} \
|
mariadb-client \
|
||||||
mariadb-server-utils>${MARIADB_VERSION} \
|
mariadb-server-utils \
|
||||||
&& apk --no-cache --update upgrade \
|
&& rm -f /var/cache/apk/* \
|
||||||
&& sed -i 's/skip-networking/skip-networking=0/' /etc/my.cnf.d/mariadb-server.cnf
|
&& sed -i 's/skip-networking/skip-networking=0/' /etc/my.cnf.d/mariadb-server.cnf
|
||||||
|
|
||||||
# expose ports
|
# expose ports
|
||||||
@@ -36,6 +30,14 @@ EXPOSE 3306
|
|||||||
# create volume if user forgets
|
# create volume if user forgets
|
||||||
VOLUME ["/var/lib/mysql"]
|
VOLUME ["/var/lib/mysql"]
|
||||||
|
|
||||||
|
# basic healthcheck (service only)
|
||||||
|
HEALTHCHECK \
|
||||||
|
--interval=30s \
|
||||||
|
--timeout=10s \
|
||||||
|
--start-period=30s \
|
||||||
|
--retries=3 \
|
||||||
|
CMD mysqladmin ping --silent
|
||||||
|
|
||||||
# set environment variables
|
# set environment variables
|
||||||
ENV TZ=Etc/UTC
|
ENV TZ=Etc/UTC
|
||||||
ENV MYSQL_UID=8100
|
ENV MYSQL_UID=8100
|
||||||
@@ -58,7 +60,9 @@ RUN mkdir -p /docker-entrypoint-preinit.d \
|
|||||||
ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
|
ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
|
||||||
CMD [ "/usr/bin/mysqld", "--user=mysql", "--console" ]
|
CMD [ "/usr/bin/mysqld", "--user=mysql", "--console" ]
|
||||||
|
|
||||||
|
# add parameters, version and build date labels
|
||||||
# set build timestamp and version labels
|
# set build timestamp and version labels
|
||||||
|
ARG MARIADB_VERSION
|
||||||
ARG INTERNAL_VERSION
|
ARG INTERNAL_VERSION
|
||||||
ARG GIT_COMMIT
|
ARG GIT_COMMIT
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|||||||
Reference in New Issue
Block a user