feature(DOCKERFILE): use edge repo
- change alpine repo to EDGE so latest versions can be used - update mariaDB minor version
This commit is contained in:
parent
7e10cf3996
commit
e4df2adce6
@ -1,7 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="114c4900-1ad3-480d-a423-ea02ef8f6005" name="Default Changelist" comment="" />
|
<list default="true" id="114c4900-1ad3-480d-a423-ea02ef8f6005" name="Default Changelist" comment="">
|
||||||
|
<change afterPath="$PROJECT_DIR$/.run/build-datestampWindows.run.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.mariadb-alpine.dir/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.mariadb-alpine.dir/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
|
||||||
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
@ -13,15 +17,28 @@
|
|||||||
<component name="GitToolBoxStore">
|
<component name="GitToolBoxStore">
|
||||||
<option name="projectConfigVersion" value="2" />
|
<option name="projectConfigVersion" value="2" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="IdeDocumentHistory">
|
||||||
|
<changedPaths>
|
||||||
|
<option value="$PROJECT_DIR$/Dockerfile" />
|
||||||
|
</changedPaths>
|
||||||
|
</component>
|
||||||
<component name="ProjectId" id="1mEUx5cS7E0AfMFfANhfLJYwTfS" />
|
<component name="ProjectId" id="1mEUx5cS7E0AfMFfANhfLJYwTfS" />
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||||
<component name="ProjectViewState">
|
<component name="ProjectViewState">
|
||||||
|
<option name="autoscrollToSource" value="true" />
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||||
|
<property name="node.js.detected.package.eslint" value="true" />
|
||||||
|
<property name="node.js.detected.package.tslint" value="true" />
|
||||||
|
<property name="node.js.path.for.package.eslint" value="project" />
|
||||||
|
<property name="node.js.path.for.package.tslint" value="project" />
|
||||||
|
<property name="node.js.selected.package.eslint" value="(autodetect)" />
|
||||||
|
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
||||||
|
<property name="nodejs_package_manager_path" value="npm" />
|
||||||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||||
<property name="vue.rearranger.settings.migration" value="true" />
|
<property name="vue.rearranger.settings.migration" value="true" />
|
||||||
</component>
|
</component>
|
||||||
@ -35,7 +52,16 @@
|
|||||||
<updated>1609058490002</updated>
|
<updated>1609058490002</updated>
|
||||||
<workItem from="1609058494288" duration="604000" />
|
<workItem from="1609058494288" duration="604000" />
|
||||||
<workItem from="1609059119559" duration="214000" />
|
<workItem from="1609059119559" duration="214000" />
|
||||||
|
<workItem from="1609059354834" duration="6715000" />
|
||||||
</task>
|
</task>
|
||||||
|
<task id="LOCAL-00001" summary="build: Rider project config files">
|
||||||
|
<created>1609059462884</created>
|
||||||
|
<option name="number" value="00001" />
|
||||||
|
<option name="presentableId" value="LOCAL-00001" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1609059462884</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="2" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@ -55,5 +81,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|
||||||
|
<MESSAGE value="build: Rider project config files" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="build: Rider project config files" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -15,7 +15,7 @@ LABEL org.label-schema.usage="https://git.asifbacchus.app/ab-docker/mariadb-alpi
|
|||||||
LABEL org.label-schema.vcs-url="https://git.asifbacchus.app/ab-docker/mariadb-alpine.git"
|
LABEL org.label-schema.vcs-url="https://git.asifbacchus.app/ab-docker/mariadb-alpine.git"
|
||||||
|
|
||||||
# install mariadb and turn on TCP connection in default config
|
# install mariadb and turn on TCP connection in default config
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main add \
|
||||||
tzdata \
|
tzdata \
|
||||||
mariadb \
|
mariadb \
|
||||||
mariadb-client \
|
mariadb-client \
|
||||||
@ -55,5 +55,5 @@ CMD [ "/usr/bin/mysqld", "--user=mysql", "--console" ]
|
|||||||
# add build date and version labels
|
# add build date and version labels
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
LABEL org.label-schema.build-date=${BUILD_DATE}
|
LABEL org.label-schema.build-date=${BUILD_DATE}
|
||||||
LABEL org.label-schema.vendor="mariaDB (10.5.6-r0)"
|
LABEL org.label-schema.vendor="mariaDB (10.5.8-r0)"
|
||||||
LABEL org.label-schema.version="1.0"
|
LABEL org.label-schema.version="1.0"
|
Loading…
Reference in New Issue
Block a user