Merge pull request #133 from dokku/dockerfile-update
Pull image from Dockerfile
This commit is contained in:
1
Dockerfile
Normal file
1
Dockerfile
Normal file
@@ -0,0 +1 @@
|
|||||||
|
FROM mongo:3.6.15
|
||||||
12
bin/generate
12
bin/generate
@@ -474,12 +474,16 @@ def main():
|
|||||||
image = None
|
image = None
|
||||||
alias = None
|
alias = None
|
||||||
unimplemented = []
|
unimplemented = []
|
||||||
|
|
||||||
|
with open("Dockerfile") as f:
|
||||||
|
for line in f.readlines():
|
||||||
|
if "FROM " in line:
|
||||||
|
image, version = line.split(" ")[1].split(":")
|
||||||
|
image = image.strip()
|
||||||
|
version = version.strip()
|
||||||
|
|
||||||
with open("config") as f:
|
with open("config") as f:
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
if "IMAGE_VERSION=${" in line:
|
|
||||||
version = re.search('"(.+)"', line).group(1)
|
|
||||||
if "_IMAGE=${" in line:
|
|
||||||
image = re.search('"(.+)"', line).group(1)
|
|
||||||
if "PLUGIN_COMMAND_PREFIX=" in line:
|
if "PLUGIN_COMMAND_PREFIX=" in line:
|
||||||
service = re.search('"(.+)"', line).group(1)
|
service = re.search('"(.+)"', line).group(1)
|
||||||
if "PLUGIN_DEFAULT_ALIAS=" in line:
|
if "PLUGIN_DEFAULT_ALIAS=" in line:
|
||||||
|
|||||||
5
config
5
config
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
export MONGO_IMAGE=${MONGO_IMAGE:="mongo"}
|
_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.6.15"}
|
export MONGO_IMAGE=${MONGO_IMAGE:="$(awk -F '[ :]' '{print $2}' "${_DIR}/Dockerfile")"}
|
||||||
|
export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="$(awk -F '[ :]' '{print $3}' "${_DIR}/Dockerfile")"}
|
||||||
export MONGO_ROOT=${MONGO_ROOT:="$DOKKU_LIB_ROOT/services/mongo"}
|
export MONGO_ROOT=${MONGO_ROOT:="$DOKKU_LIB_ROOT/services/mongo"}
|
||||||
export MONGO_HOST_ROOT=${MONGO_HOST_ROOT:=$MONGO_ROOT}
|
export MONGO_HOST_ROOT=${MONGO_HOST_ROOT:=$MONGO_ROOT}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,9 @@ echo "Dokku version $DOKKU_VERSION"
|
|||||||
|
|
||||||
export DOKKU_LIB_ROOT="/var/lib/dokku"
|
export DOKKU_LIB_ROOT="/var/lib/dokku"
|
||||||
export DOKKU_PLUGINS_ROOT="$DOKKU_LIB_ROOT/plugins/available"
|
export DOKKU_PLUGINS_ROOT="$DOKKU_LIB_ROOT/plugins/available"
|
||||||
source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
|
pushd "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")" >/dev/null
|
||||||
|
source "config"
|
||||||
|
popd >/dev/null
|
||||||
sudo rm -rf "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX"
|
sudo rm -rf "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX"
|
||||||
sudo mkdir -p "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX/subcommands" "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX/scripts"
|
sudo mkdir -p "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX/subcommands" "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX/scripts"
|
||||||
sudo find ./ -maxdepth 1 -type f -exec cp '{}' "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" \;
|
sudo find ./ -maxdepth 1 -type f -exec cp '{}' "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" \;
|
||||||
|
|||||||
Reference in New Issue
Block a user