aws-cli/run.sh

@@ -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
 }
 
-sync() {
+move() {
 	local source_dir="$1"
 	shift
 	local target_dir="$1"
@@ -250,7 +250,7 @@ sync() {
 		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
 		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
 		${SERVICE_NAME} \
-		aws s3 sync "s3://${source_dir}" "s3://${target_dir}" ${args} --delete --metadata-directive COPY
+		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
 }
 
 

elastic-search/Dockerfile

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

elastic-search/run.sh

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