Compare commits

..

2 Commits

Author SHA1 Message Date
4ae006a796 Fix sync and move functions 2018-04-11 06:23:07 +02:00
d7c86421f6 Install xpack for elastic 5.3.2 2018-04-11 06:22:02 +02:00
3 changed files with 13 additions and 7 deletions

View File

@ -230,7 +230,7 @@ move() {
aws s3 mv "s3://${source_dir}" "s3://${target_dir}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE aws s3 mv "s3://${source_dir}" "s3://${target_dir}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
} }
move() { sync() {
local source_dir="$1" local source_dir="$1"
shift shift
local target_dir="$1" local target_dir="$1"
@ -250,7 +250,7 @@ move() {
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ --env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
${SERVICE_NAME} \ ${SERVICE_NAME} \
aws s3 sync "s3://${source_dir}" "s3://${target_dir}" ${args} --delete --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE aws s3 sync "s3://${source_dir}" "s3://${target_dir}" ${args} --delete --metadata-directive COPY
} }

View File

@ -2,6 +2,8 @@ ARG IMAGE_NAME
ARG IMAGE_VERSION ARG IMAGE_VERSION
FROM ${IMAGE_NAME}:${IMAGE_VERSION} FROM ${IMAGE_NAME}:${IMAGE_VERSION}
RUN bin/elasticsearch-plugin install x-pack
ADD elasticsearch.yml /usr/share/elasticsearch/config/ ADD elasticsearch.yml /usr/share/elasticsearch/config/
USER root USER root

View File

@ -42,12 +42,16 @@ init() {
__ask_to_start __ask_to_start
} }
release() { build() {
docker build \ docker build \
--build-arg IMAGE_NAME=${IMAGE_NAME} \ --build-arg IMAGE_NAME=${IMAGE_NAME} \
--build-arg IMAGE_VERSION=${IMAGE_VERSION} \ --build-arg IMAGE_VERSION=${IMAGE_VERSION} \
-t ${RELEASE_NAME}:${RELEASE_VERSION} \ -t ${RELEASE_NAME}:${RELEASE_VERSION} \
${SCRIPT_PATH} ${SCRIPT_PATH}
}
release() {
build
docker push ${RELEASE_NAME}:${RELEASE_VERSION} docker push ${RELEASE_NAME}:${RELEASE_VERSION}