Skip to content

Commit 8496a3f

Browse files
donoghucdonoghuc
committed
fix merge conflicts
1 parent f925571 commit 8496a3f

File tree

2 files changed

+5
-62
lines changed

2 files changed

+5
-62
lines changed

‎docker/Makefile‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -157,33 +157,19 @@ public-dockerfiles_oss: templates/Dockerfile.erb docker_paths $(COPY_FILES)
157157
cp $(ARTIFACTS_DIR)/Dockerfile-oss Dockerfile && \
158158
tar -zcf ../logstash-oss-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
159159

160-
<<<<<<< HEAD
161160
public-dockerfiles_ubi8: templates/Dockerfile.erb docker_paths $(COPY_FILES)
162-
=======
163-
public-dockerfiles_wolfi: templates/Dockerfile.erb docker_paths $(COPY_FILES)
164-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
165161
../vendor/jruby/bin/jruby -S erb -T "-"\
166162
created_date="${BUILD_DATE}" \
167163
elastic_version="${ELASTIC_VERSION}" \
168164
arch="${ARCHITECTURE}" \
169165
version_tag="${VERSION_TAG}" \
170-
<<<<<<< HEAD
171166
release="${RELEASE}" \
172167
image_flavor="ubi8" \
173-
local_artifacts="false" \
168+
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
174169
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ubi8" && \
175170
cd $(ARTIFACTS_DIR)/docker && \
176171
cp $(ARTIFACTS_DIR)/Dockerfile-ubi8 Dockerfile && \
177172
tar -zcf ../logstash-ubi8-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
178-
=======
179-
release="${RELEASE}" \
180-
image_flavor="wolfi" \
181-
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
182-
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-wolfi" && \
183-
cd $(ARTIFACTS_DIR)/docker && \
184-
cp $(ARTIFACTS_DIR)/Dockerfile-wolfi Dockerfile && \
185-
tar -zcf ../logstash-wolfi-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
186-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
187173

188174
public-dockerfiles_observability-sre: templates/Dockerfile.erb docker_paths $(COPY_FILES)
189175
../vendor/jruby/bin/jruby -S erb -T "-"\
@@ -199,7 +185,6 @@ public-dockerfiles_observability-sre: templates/Dockerfile.erb docker_paths $(CO
199185
cp $(ARTIFACTS_DIR)/Dockerfile-observability-sre Dockerfile && \
200186
tar -zcf ../logstash-observability-sre-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
201187

202-
<<<<<<< HEAD
203188
public-dockerfiles_wolfi: templates/Dockerfile.erb docker_paths $(COPY_FILES)
204189
../vendor/jruby/bin/jruby -S erb -T "-"\
205190
created_date="${BUILD_DATE}" \
@@ -208,16 +193,13 @@ public-dockerfiles_wolfi: templates/Dockerfile.erb docker_paths $(COPY_FILES)
208193
version_tag="${VERSION_TAG}" \
209194
release="${RELEASE}" \
210195
image_flavor="wolfi" \
211-
local_artifacts="false" \
196+
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
212197
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-wolfi" && \
213198
cd $(ARTIFACTS_DIR)/docker && \
214199
cp $(ARTIFACTS_DIR)/Dockerfile-wolfi Dockerfile && \
215200
tar -zcf ../logstash-wolfi-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
216201

217202
public-dockerfiles_ironbank: templates/hardening_manifest.yaml.erb templates/Dockerfile.erb ironbank_docker_paths $(COPY_IRONBANK_FILES)
218-
=======
219-
public-dockerfiles_ironbank: templates/hardening_manifest.yaml.erb templates/IronbankDockerfile.erb ironbank_docker_paths $(COPY_IRONBANK_FILES)
220-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
221203
../vendor/jruby/bin/jruby -S erb -T "-"\
222204
elastic_version="${ELASTIC_VERSION}" \
223205
templates/hardening_manifest.yaml.erb > $(ARTIFACTS_DIR)/ironbank/hardening_manifest.yaml && \
@@ -228,13 +210,8 @@ public-dockerfiles_ironbank: templates/hardening_manifest.yaml.erb templates/Iro
228210
version_tag="${VERSION_TAG}" \
229211
release="${RELEASE}" \
230212
image_flavor="ironbank" \
231-
<<<<<<< HEAD
232-
local_artifacts="false" \
233-
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ironbank" && \
234-
=======
235213
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
236-
templates/IronbankDockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ironbank" && \
237-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
214+
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ironbank" && \
238215
cd $(ARTIFACTS_DIR)/ironbank && \
239216
cp $(ARTIFACTS_DIR)/Dockerfile-ironbank Dockerfile && \
240217
tar -zcf ../logstash-ironbank-$(VERSION_TAG)-docker-build-context.tar.gz scripts Dockerfile hardening_manifest.yaml LICENSE README.md

‎rakelib/artifacts.rake‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,8 @@ namespace "artifact" do
171171

172172
desc "Generate rpm, deb, tar and zip artifacts"
173173
task "all" => ["prepare", "build"]
174-
<<<<<<< HEAD
175-
task "docker_only" => ["prepare", "build_docker_full", "build_docker_oss", "build_docker_ubi8", "build_docker_wolfi", "build_docker_observabilitySRE"]
176-
=======
177-
task "docker_only" => ["prepare", "docker", "docker_oss", "docker_wolfi", "docker_observabilitySRE"]
178-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
174+
175+
task "docker_only" => ["prepare", "docker", "docker_oss", "docker_ubi8", "docker_wolfi", "docker_observabilitySRE"]
179176

180177
desc "Build all (jdk bundled and not) tar.gz and zip of default logstash plugins with all dependencies"
181178
task "archives" => ["prepare", "generate_build_metadata"] do
@@ -422,15 +419,12 @@ namespace "artifact" do
422419
build_dockerfile('full')
423420
end
424421

425-
<<<<<<< HEAD
426422
desc "Generate Dockerfile for UBI8 images"
427423
task "dockerfile_ubi8" => ["prepare", "generate_build_metadata"] do
428424
puts("[dockerfiles] Building ubi8 Dockerfiles")
429425
build_dockerfile('ubi8')
430426
end
431427

432-
=======
433-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
434428
desc "Generate Dockerfile for wolfi images"
435429
task "dockerfile_wolfi" => ["prepare", "generate_build_metadata"] do
436430
puts("[dockerfiles] Building wolfi Dockerfiles")
@@ -464,34 +458,6 @@ namespace "artifact" do
464458
Rake::Task["artifact:archives_oss"].invoke
465459
end
466460

467-
<<<<<<< HEAD
468-
task "build_docker_full" => [:generate_build_metadata] do
469-
Rake::Task["artifact:docker"].invoke
470-
Rake::Task["artifact:dockerfile_full"].invoke
471-
end
472-
473-
task "build_docker_oss" => [:generate_build_metadata] do
474-
Rake::Task["artifact:docker_oss"].invoke
475-
Rake::Task["artifact:dockerfile_oss"].invoke
476-
end
477-
478-
task "build_docker_ubi8" => [:generate_build_metadata] do
479-
Rake::Task["artifact:docker_ubi8"].invoke
480-
Rake::Task["artifact:dockerfile_ubi8"].invoke
481-
end
482-
483-
task "build_docker_observabilitySRE" => [:generate_build_metadata] do
484-
Rake::Task["artifact:docker_observabilitySRE"].invoke
485-
Rake::Task["artifact:dockerfile_observabilitySRE"].invoke
486-
end
487-
488-
task "build_docker_wolfi" => [:generate_build_metadata] do
489-
Rake::Task["artifact:docker_wolfi"].invoke
490-
Rake::Task["artifact:dockerfile_wolfi"].invoke
491-
end
492-
493-
=======
494-
>>>>>>> a994c7cb (Remove redundant testing and circular dependency from docker acceptance testing (#18181))
495461
task "generate_build_metadata" do
496462
require 'time'
497463
require 'tempfile'

0 commit comments

Comments
 (0)