Skip to content

Remove Amazon Linux 1 #182

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.

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 2 commits into from
Feb 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,6 @@ jobs:
key: nginx-asg-sync-${{ github.run_id }}-${{ github.run_number }}
- name: Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build Image Amazon 1
uses: docker/build-push-action@v2
with:
file: build/Dockerfile
context: '.'
target: local
load: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: amazon-builder:${{ github.sha }}
build-args: |
CONTAINER_VERSION=amazonlinux:1
OS_TYPE=rpm_based
- name: Run Amazon 1
uses: addnab/docker-run-action@v3
with:
image: amazon-builder:${{ github.sha }}
run: /build.sh
options: -v ${{ github.workspace }}/build/package/rpm:/rpm -v ${{ github.workspace }}/build_output:/build_output
- name: Build Image Amazon 2
uses: docker/build-push-action@v2
with:
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ TARGET ?= local

export DOCKER_BUILDKIT = 1

all: amazon amazon2 centos7 centos8 debian
all: amazon2 centos7 centos8 debian

.PHONY: test
test:
Expand All @@ -19,10 +19,6 @@ ifeq (${TARGET},local)
CGO_ENABLED=0 GOFLAGS="-gcflags=-trimpath=${GOPATH} -asmflags=-trimpath=${GOPATH}" GOOS=linux go build -trimpath -ldflags "-s -w" -o nginx-asg-sync github.com/nginxinc/nginx-asg-sync/cmd/sync
endif

amazon: build
docker build -t amazon-builder --target ${TARGET} --build-arg CONTAINER_VERSION=amazonlinux:1 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output amazon-builder

amazon2: build
docker build -t amazon2-builder --target ${TARGET} --build-arg CONTAINER_VERSION=amazonlinux:2 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output amazon2-builder
Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ We provide packages for the following operating systems:

* Ubuntu 16.04 and later, Debian 9/10
* CentOS/RHEL: 7, 8
* Amazon Linux: 1, 2
* Amazon Linux: 2

Support for other operating systems can be added.

Expand Down Expand Up @@ -148,9 +148,7 @@ See the example for your cloud provider: [AWS](examples/aws.md), [Azure](example

nginx-asg-sync runs as a system service and supports the start/stop/restart commands.

For Amazon Linux 1, run: `$ sudo start|stop|restart nginx-asg-sync`

For Ubuntu >= 16.04, Debian 9/10, CentOS7/RHEL7, CentOS8/RHEL8 and Amazon Linux 2, run: `$ sudo service nginx-asg-sync start|stop|restart`
`$ sudo service nginx-asg-sync start|stop|restart`

## Troubleshooting

Expand All @@ -165,7 +163,6 @@ You can compile nginx-asg-sync and build a software package using the provided M

To build a software package, run: `$ make <os>`
where `<os>` is the target OS. The following values are allowed:
* `amazon` for Amazon Linux 1
* `amazon2` for Amazon Linux 2
* `centos7` for CentOS7/RHEL7
* `centos8` for CentOS8/RHEL8
Expand Down