Skip to content

Resolve the gem building errors before docker creation #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 29, 2021
Merged

Resolve the gem building errors before docker creation #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d66872
Add new docker building scripts for logstash
peterzhuamazon Jul 29, 2021
803075d
Move build related vars to the top
peterzhuamazon Jul 29, 2021
ba5af49
Tweak and improve the docker script comments
peterzhuamazon Jul 29, 2021
141d799
Tweak and improve the docker script comments
peterzhuamazon Jul 29, 2021
e245fe6
Resolve gem building incorrectly due to move of spec files
peterzhuamazon Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions release/docker/build-docker-multi-arch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

# This is intended to be run the plugin's root directory. `dockerfiles/run.sh`
# Ensure you have Docker and docker-compose installed locally
# This is intended to be run the plugin's root directory. `release/docker`
# Ensure you have Docker Desktop installed as buildx only support Docker Desktop on macOS and Windows

set -e

# Variables
Expand Down
8 changes: 6 additions & 2 deletions release/docker/build-plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@
# Ensure you have Docker installed locally and set the VERSION and BUILD_DATE environment variable.
set -e

CURR_DIR=`dirname $(realpath $0)`; cd $CURR_DIR
GIT_ROOT=`git rev-parse --show-toplevel`

echo 'Clear previous gem'
echo -n "Remove "; rm -rfv logstash-output-opensearch*.gem

echo 'Copy gemspec'
trap '{ echo -n "Remove "; rm -rfv logstash-output-opensearch.gemspec; }' INT TERM EXIT
cp -v ../../logstash-output-opensearch.gemspec .
cd $GIT_ROOT # We need to build the gem in root of this repo so .gemspec file contained locations are resolving correctly

echo 'Building plugin gem'
gem build logstash-output-opensearch.gemspec

echo 'Move Gem Location'
mv -v logstash-output-opensearch*.gem $CURR_DIR