File tree Expand file tree Collapse file tree 6 files changed +22
-3
lines changed Expand file tree Collapse file tree 6 files changed +22
-3
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ GO_DOCKER_RUN = docker run --rm -v $(shell pwd):/go/src/github.com/nginxinc/ngin
2
2
GOLANG_CONTAINER = golang:1.10
3
3
BUILD_IN_CONTAINER = 1
4
4
5
- all : amazon centos7 ubuntu-trusty ubuntu-xenial
5
+ all : amazon centos7 ubuntu-trusty ubuntu-xenial amazon2
6
6
7
7
test :
8
8
ifeq ($(BUILD_IN_CONTAINER ) ,1)
@@ -22,6 +22,10 @@ amazon: compile
22
22
make -C build/package/builders/amazon/
23
23
docker run --rm -v $(shell pwd) /build/package/rpm:/rpm -v $(shell pwd) /build_output:/build_output amazon-builder
24
24
25
+ amazon2 : compile
26
+ make -C build/package/builders/amazon2/
27
+ docker run --rm -v $(shell pwd) /build/package/rpm:/rpm -v $(shell pwd) /build_output:/build_output amazon2-builder
28
+
25
29
centos7 : compile
26
30
make -C build/package/builders/centos7/
27
31
docker run --rm -v $(shell pwd) /build/package/rpm:/rpm -v $(shell pwd) /build_output:/build_output centos7-builder
Original file line number Diff line number Diff line change @@ -162,7 +162,8 @@ You can compile nginx-asg-sync and build a software package using the provided M
162
162
163
163
To build a software package, run : ` $ make <os>`
164
164
where `<os>` is the target OS. The following values are allowed :
165
- * `amazon` for Amazon Linux
165
+ * `amazon` for Amazon Linux 1
166
+ * `amazon2` for Amazon Linux 2
166
167
* `centos7` for CentOS7/RHEL7
167
168
* `ubuntu-trusty` for Ubuntu 14.04
168
169
* `ubuntu-xenial` for Ubuntu 16.04
Original file line number Diff line number Diff line change 1
- FROM amazonlinux:2018.03.0.20180424
1
+ FROM amazonlinux:1
2
2
3
3
RUN yum install -y rpmdevtools
4
4
ADD build.sh /
Original file line number Diff line number Diff line change
1
+ FROM amazonlinux:2
2
+
3
+ RUN yum install -y rpmdevtools
4
+ ADD build.sh /
5
+
6
+ ENTRYPOINT ["/build.sh" ]
Original file line number Diff line number Diff line change
1
+ build :
2
+ docker build -t amazon2-builder .
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+
3
+ mkdir -p ~ /rpmbuild
4
+ cp -r rpm/* ~ /rpmbuild/
5
+ rpmbuild -bb ~ /rpmbuild/SPECS/nginx-asg-sync.spec
6
+ cp ~ /rpmbuild/RPMS/x86_64/* .rpm /build_output
You can’t perform that action at this time.
0 commit comments