github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6756 from simonpasquier/revert-6605 

Revert "Add armv6 docker image (#6605)"
pull/6764/head
Bartlomiej Plotka 5 years ago committed by GitHub
parent
492414542e 3297ae2169
commit
49f8850a3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .dockerignore
  2. 2
      Makefile

1
.dockerignore
Unescape View File

@ -3,7 +3,6 @@ data/
.tarballs/ .tarballs/
!.build/linux-amd64/ !.build/linux-amd64/
!.build/linux-armv6/
!.build/linux-armv7/ !.build/linux-armv7/
!.build/linux-arm64/ !.build/linux-arm64/
!.build/linux-s390x/ !.build/linux-s390x/

2
Makefile
Unescape View File

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
# Needs to be defined before including Makefile.common to auto-generate targets # Needs to be defined before including Makefile.common to auto-generate targets
DOCKER_ARCHS ?= amd64 armv6 armv7 arm64 s390x DOCKER_ARCHS ?= amd64 armv7 arm64 s390x
REACT_APP_PATH = web/ui/react-app REACT_APP_PATH = web/ui/react-app
REACT_APP_SOURCE_FILES = $(wildcard $(REACT_APP_PATH)/public/* $(REACT_APP_PATH)/src/* $(REACT_APP_PATH)/tsconfig.json) REACT_APP_SOURCE_FILES = $(wildcard $(REACT_APP_PATH)/public/* $(REACT_APP_PATH)/src/* $(REACT_APP_PATH)/tsconfig.json)

Write Preview
Loading…
Cancel
Save